[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [rhel5-branch] Do not remove filesystem labels set in kickstart (#797075)



On Wed, Jun 06, 2012 at 01:34:42PM +0200, Martin Gracik wrote:
> ---
>  fsset.py |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/fsset.py b/fsset.py
> index 6b87ff5..2e6d390 100644
> --- a/fsset.py
> +++ b/fsset.py
> @@ -1822,9 +1822,6 @@ MAILADDR root
>                      sys.exit(0)
>  
>      def labelEntry(self, entry, chroot):
> -        # remove old label
> -        entry.setLabel(None)
> -
>          label = entry.device.getLabel()
>          if label:
>              entry.setLabel(label)
> @@ -1832,7 +1829,10 @@ MAILADDR root
>                  entry.device.doLabel = 1
>          if entry.device.doLabel is not None:
>              entry.fsystem.labelDevice(entry, chroot)
> -    
> +        elif not label:
> +            # remove old label
> +            entry.setLabel(None)
> +
>      def formatEntry(self, entry, chroot):
>          if entry.mountpoint:
>              log.info("formatting %s as %s" %(entry.mountpoint, entry.fsystem.name))
> -- 
> 1.7.9.5

Ack

-- 
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)

Attachment: pgp4HdQ3XymqS.pgp
Description: PGP signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]