On Fri, 2011-05-06 at 11:43 -0700, Brian C. Lane wrote:
> dracut is changing the form of the kernel args, update anaconda to use
> the new form rd.* instead of rd_*
Looks okay to me.
>
> Resolves: rhbz#702711
> ---
> pyanaconda/bootloader.py | 8 ++++----
> pyanaconda/network.py | 2 +-
> pyanaconda/storage/devices.py | 14 +++++++-------
> 3 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
> index a3e98ab..5dbedf8 100644
> --- a/pyanaconda/bootloader.py
> +++ b/pyanaconda/bootloader.py
> @@ -650,10 +650,10 @@ class BootLoader(object):
> # When we see a device whose setup string starts with a key in this
> # dict we pop that pair from the dict. When we're done looking at
> # devices we are left with the values that belong in the boot args.
> - dracut_storage = {"rd_LUKS_UUID": "rd_NO_LUKS",
> - "rd_LVM_LV": "rd_NO_LVM",
> - "rd_MD_UUID": "rd_NO_MD",
> - "rd_DM_UUID": "rd_NO_DM"}
> + dracut_storage = {"rd.luks.uuid": "rd.luks=0",
> + "rd.lvm.lv": "rd.lvm=0",
> + "rd.md.uuid": "rd.md=0",
> + "rd.dm.uuid": "rd.dm=0"}
> for device in dracut_devices:
> for dep in self.storage.devices:
> if device in done:
> diff --git a/pyanaconda/network.py b/pyanaconda/network.py
> index 3b17a90..8ec4a06 100644
> --- a/pyanaconda/network.py
> +++ b/pyanaconda/network.py
> @@ -891,7 +891,7 @@ class Network:
> if netargs != "":
> netargs += " "
>
> - netargs += "rd_ZNET=%s,%s" % (nettype, subchannels)
> + netargs += "rd.znet=%s,%s" % (nettype, subchannels)
>
> options = dev.get("OPTIONS").strip("'\"")
> if options:
> diff --git a/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py
> index e39c11f..c1c5ce6 100644
> --- a/pyanaconda/storage/devices.py
> +++ b/pyanaconda/storage/devices.py
> @@ -1924,7 +1924,7 @@ class LUKSDevice(DMCryptDevice):
> StorageDevice._postTeardown(self, recursive=recursive)
>
> def dracutSetupString(self):
> - return "rd_LUKS_UUID=luks-%s" % self.slave.format.uuid
> + return "rd.luks.uuid=luks-%s" % self.slave.format.uuid
>
>
> class LVMVolumeGroupDevice(DMDevice):
> @@ -2606,7 +2606,7 @@ class LVMLogicalVolumeDevice(DMDevice):
> def dracutSetupString(self):
> # Note no mapName usage here, this is a lvm cmdline name, which
> # is different (ofcourse)
> - return "rd_LVM_LV=%s/%s" % (self.vg.name, self._name)
> + return "rd.lvm.lv=%s/%s" % (self.vg.name, self._name)
>
> def checkSize(self):
> """ Check to make sure the size of the device is allowed by the
> @@ -3086,7 +3086,7 @@ class MDRaidArrayDevice(StorageDevice):
> return self.type == "mdbiosraidarray"
>
> def dracutSetupString(self):
> - return "rd_MD_UUID=%s" % self.uuid
> + return "rd.md.uuid=%s" % self.uuid
>
>
> class DMRaidArrayDevice(DMDevice):
> @@ -3196,7 +3196,7 @@ class DMRaidArrayDevice(DMDevice):
> return self.description
>
> def dracutSetupString(self):
> - return "rd_DM_UUID=%s" % self.name
> + return "rd.dm.uuid=%s" % self.name
>
> class MultipathDevice(DMDevice):
> """ A multipath device """
> @@ -3712,7 +3712,7 @@ class ZFCPDiskDevice(DiskDevice):
> 'lun': self.fcp_lun}
>
> def dracutSetupString(self):
> - return "rd_ZFCP=%s,%s,%s" % (self.hba_id, self.wwpn, self.fcp_lun,)
> + return "rd.zfcp=%s,%s,%s" % (self.hba_id, self.wwpn, self.fcp_lun,)
>
>
> class DASDDevice(DiskDevice):
> @@ -3751,9 +3751,9 @@ class DASDDevice(DiskDevice):
> opts[parts[0]] = parts
>
> if self.busid in opts.keys():
> - return "rd_DASD=%s" % ",".join(opts[self.busid])
> + return "rd.dasd=%s" % ",".join(opts[self.busid])
> else:
> - return "rd_DASD=%s" % ",".join([self.busid] + self.getOpts())
> + return "rd.dasd=%s" % ",".join([self.busid] + self.getOpts())
>
> class NFSDevice(StorageDevice, NetworkStorageDevice):
> """ An NFS device """
> --
> 1.7.4.4
>
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list@xxxxxxxxxx
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
