Fabian Deutsch has uploaded a new change for review. Change subject: Move initramfs regeneration until after grub is installed ......................................................................
Move initramfs regeneration until after grub is installed It needs to happen after the grub install, or grub2-install gets very confused about what disk it's going to boot from. This is because updating the initramfs also umounts /liveos and /boot Also, revert the changes to mount_liveos, which has too many interactions with ovirt-functions.sh and other parts of the system to change without side effects Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1260548 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1260551 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1260559 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1259220 Change-Id: Id8df5dd1ca6e3ab6be01d45958e2ef48b119c241 Signed-off-by: Ryan Barry <[email protected]> Signed-off-by: Fabian Deutsch <[email protected]> --- M src/ovirtnode/install.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/05/46105/1 diff --git a/src/ovirtnode/install.py b/src/ovirtnode/install.py index c2b808f..d59b3a8 100755 --- a/src/ovirtnode/install.py +++ b/src/ovirtnode/install.py @@ -594,9 +594,6 @@ "rd_NO_MULTIPATH", "") - # Update initramfs to pickup multipath wwids - _system.Initramfs().rebuild() - if " " in self.disk: # workaround for grub setup failing with spaces in dev.name: # use first active sd* device @@ -678,6 +675,9 @@ else: logger.info("Grub Installation Completed") + # Update initramfs to pickup multipath wwids + _system.Initramfs().rebuild() + if _functions.is_iscsi_install() or _functions.findfs("BootNew"): # copy default for when Root/HostVG is inaccessible(iscsi upgrade) shutil.copy(_functions.OVIRT_DEFAULTS, "/boot") -- To view, visit https://gerrit.ovirt.org/46105 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8df5dd1ca6e3ab6be01d45958e2ef48b119c241 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Fabian Deutsch <[email protected]> Gerrit-Reviewer: Fabian Deutsch <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
