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

Re: [rhel6-branch] Don't pass rd_LUKS_UUID to dracut args (#674703)



On Wed, Aug 17, 2011 at 01:15:51PM +0200, Martin Gracik wrote:
> Let dracut find all the luks devices by itself.
> ---
>  booty/bootloaderInfo.py |    3 +--
>  storage/devices.py      |    3 ++-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py
> index e3b5d34..3f53028 100644
> --- a/booty/bootloaderInfo.py
> +++ b/booty/bootloaderInfo.py
> @@ -104,8 +104,7 @@ class KernelArguments:
>                      s = self.id.network.dracutSetupArgs(d)
>                      args.update(s)
>  
> -        for i in [ [ "rd_LUKS_UUID", "rd_NO_LUKS" ],
> -                   [ "rd_LVM_LV", "rd_NO_LVM" ],
> +        for i in [ [ "rd_LVM_LV", "rd_NO_LVM" ],
>                     [ "rd_MD_UUID", "rd_NO_MD" ],
>                     [ "rd_DM_UUID", "rd_NO_DM" ] ]:
>              if not types.has_key(i[0]):
> diff --git a/storage/devices.py b/storage/devices.py
> index 5a64e70..5add51d 100644
> --- a/storage/devices.py
> +++ b/storage/devices.py
> @@ -1785,7 +1785,8 @@ class LUKSDevice(DMCryptDevice):
>          return self.parents[0]
>  
>      def dracutSetupArgs(self):
> -        return set(["rd_LUKS_UUID=luks-%s" % self.slave.format.uuid])
> +        #return set(["rd_LUKS_UUID=luks-%s" % self.slave.format.uuid])
> +        return set()

I'd drop the commented out return, no need to keep it around when we
have git :)

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

Attachment: pgpDfmQOMAaXP.pgp
Description: PGP signature


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