Ryan Barry has uploaded a new change for review. Change subject: Make the EFI CDROM boot menu align with legacy booting ......................................................................
Make the EFI CDROM boot menu align with legacy booting Re-add this with the grub root issue sorted This reverts commit 438b721b5a4e683d2dd26d81cb1b7476c876bc0a. Change-Id: I814c6b6831963ce53e074c9f3be1da30cba6ab0a Signed-off-by: Ryan Barry <[email protected]> --- M recipe/common-efi.ks.in 1 file changed, 25 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/92/55492/1 diff --git a/recipe/common-efi.ks.in b/recipe/common-efi.ks.in index 1a3cd91..ab73dd5 100644 --- a/recipe/common-efi.ks.in +++ b/recipe/common-efi.ks.in @@ -56,21 +56,31 @@ linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 initrdefi /isolinux/initrd0.img } -menuentry 'Install or Upgrade with serial console ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os { - linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 console=ttyS0,115200n8 - initrdefi /isolinux/initrd0.img -} -menuentry 'Reinstall ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os { - linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 reinstall - initrdefi /isolinux/initrd0.img -} -menuentry 'Reinstall with serial console ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os { - linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 reinstall console=ttyS0,115200n8 - initrdefi /isolinux/initrd0.img -} -menuentry 'Uninstall' --class fedora --class gnu-linux --class gnu --class os { - linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 uninstall - initrdefi /isolinux/initrd0.img +submenu 'Troubleshooting -->' { + menuentry 'Install or Upgrade (Basic Video) ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 nomodeset + initrdefi /isolinux/initrd0.img + } + menuentry 'Install or Upgrade with serial console ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 console=ttyS0,115200n8 + initrdefi /isolinux/initrd0.img + } + menuentry 'Reinstall ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 reinstall + initrdefi /isolinux/initrd0.img + } + menuentry 'Reinstall (Basic Video) ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 reinstall nomodeset + initrdefi /isolinux/initrd0.img + } + menuentry 'Reinstall with serial console ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 reinstall console=ttyS0,115200n8 + initrdefi /isolinux/initrd0.img + } + menuentry 'Uninstall' --class fedora --class gnu-linux --class gnu --class os { + linuxefi /isolinux/vmlinuz0 @BOOTLOADER_ARGS@ root=live:CDLABEL=$NAME rootfstype=auto ro liveimg rootflags=ro elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd.luks=0 rd.md=0 rd.dm=0 uninstall + initrdefi /isolinux/initrd0.img + } } EOF fi -- To view, visit https://gerrit.ovirt.org/55492 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I814c6b6831963ce53e074c9f3be1da30cba6ab0a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Ryan Barry <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
