[rhel6-branch] Remove manual call to recreate initrd if installing on iSCSI. (#1007884)
Vratislav Podzimek
vpodzime at redhat.com
Wed Oct 16 14:10:34 UTC 2013
On Wed, 2013-10-16 at 09:53 -0400, Samantha N. Bueno wrote:
> No longer necessary.
>
> Resolves: rhbz#1007884
> ---
> backend.py | 14 +-------------
> 1 file changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/backend.py b/backend.py
> index 2bb0b41..55ebff4 100644
> --- a/backend.py
> +++ b/backend.py
> @@ -81,23 +81,11 @@ class AnacondaBackend:
> log.error("Could not copy firmware file %s: %s" % (f, e.strerror))
>
> def doPostInstall(self, anaconda):
> - has_iscsi_disk = False
> -
> - # See if we have an iscsi disk. If we do we rerun mkinitrd, as
> - # the initrd might need iscsi-initiator-utils, and chances are
> - # it was not installed yet the first time mkinitrd was run, as
> - # mkinitrd does not require it.
> - root = anaconda.id.storage.rootDevice
> - disks = anaconda.id.storage.devicetree.getDevicesByType("iscsi")
> - for disk in disks:
> - if root.dependsOn(disk):
> - has_iscsi_disk = True
> - break
>
> #always copy the firmware files from DD
> self.copyFirmware(anaconda)
>
> - if anaconda.id.extraModules or has_iscsi_disk:
> + if anaconda.id.extraModules:
> for (n, arch, tag) in self.kernelVersionList(anaconda.rootPath):
> packages.recreateInitrd(n, anaconda.rootPath)
I believe this is a more defensive approach. ACK.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic
More information about the anaconda-patches
mailing list