Ryan Barry has uploaded a new change for review. Change subject: Don't show basic video options in the boot menu ......................................................................
Don't show basic video options in the boot menu We shouldn't need nomodeset in any case Change-Id: Icbaf4d96849c70b2b9b115bad29365b72947744b Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1167768 Signed-off-by: Ryan Barry <[email protected]> --- M recipe/common-efi.ks M recipe/common-nochroot.ks 2 files changed, 0 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/70/35570/1 diff --git a/recipe/common-efi.ks b/recipe/common-efi.ks index 9485b74..e448caf 100644 --- a/recipe/common-efi.ks +++ b/recipe/common-efi.ks @@ -13,17 +13,11 @@ title Install / Upgrade ${PRODUCT_SHORT}-$VERSION-$RELEASE kernel /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 initrd /isolinux/initrd0.img -title Install / Upgrade (Basic Video) ${PRODUCT_SHORT}-$VERSION-$RELEASE - kernel /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 nomodeset - initrd /isolinux/initrd0.img title Install / Upgrade with serial console ${PRODUCT_SHORT}-$VERSION-$RELEASE kernel /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 console=ttyS0,115200n8 initrd /isolinux/initrd0.img title Reinstall ${PRODUCT_SHORT}-$VERSION-$RELEASE kernel /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 reinstall - initrd /isolinux/initrd0.img -title Reinstall (Basic Video) ${PRODUCT_SHORT}-$VERSION-$RELEASE - kernel /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 reinstall nomodeset initrd /isolinux/initrd0.img title Reinstall with serial console ${PRODUCT_SHORT}-$VERSION-$RELEASE kernel /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 reinstall console=ttyS0,115200n8 @@ -56,20 +50,12 @@ linuxefi /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM rd.luks=0 rd.md=0 rd.dm=0 initrdefi /isolinux/initrd0.img } -menuentry 'Install or Upgrade (Basic Video) ${PRODUCT_SHORT}-$VERSION-$RELEASE' --class fedora --class gnu-linux --class gnu --class os { - linuxefi /isolinux/vmlinuz0 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM 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 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM 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 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM 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 root=live:CDLABEL=$NAME rootfstype=auto ro liveimg check rootflags=ro crashkernel=128M elevator=deadline install rhgb quiet rd_NO_MULTIPATH rd_NO_LVM 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 { diff --git a/recipe/common-nochroot.ks b/recipe/common-nochroot.ks index f9ee49b..271ad0f 100644 --- a/recipe/common-nochroot.ks +++ b/recipe/common-nochroot.ks @@ -29,10 +29,6 @@ } linux0==1 && $1=="label" && $2!="linux0" { linux0=2 - print "label install (basic video)" - print " menu label Install (Basic Video)" - print " kernel vmlinuz0" - print append0" nomodeset " print "label serial-console" print " menu label Install or Upgrade with serial console" print " kernel vmlinuz0" @@ -41,10 +37,6 @@ print " menu label Reinstall" print " kernel vmlinuz0" print append0" reinstall " - print "label reinstall (basic video)" - print " menu label Reinstall (Basic Video)" - print " kernel vmlinuz0" - print append0" reinstall nomodeset " print "label reinstall-serial" print " menu label Reinstall with serial console" print " kernel vmlinuz0" -- To view, visit http://gerrit.ovirt.org/35570 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icbaf4d96849c70b2b9b115bad29365b72947744b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: master Gerrit-Owner: Ryan Barry <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
