[node-patches] Change in ovirt-node[ovirt-3.6]: Revert "Make the EFI CDROM boot menu align with legacy booting"

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: Revert "Make the EFI CDROM boot menu align with legacy booting"
......................................................................

Revert "Make the EFI CDROM boot menu align with legacy booting"

This reverts commit d112bf8df698f8aa63c41530be1561360d3845f0.

Change-Id: I97adfb1ed675239939a44bc9f58acf9ede03105d
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1311800
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M recipe/common-efi.ks.in
1 file changed, 15 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/40/54040/1

diff --git a/recipe/common-efi.ks.in b/recipe/common-efi.ks.in
index 6ee816c..d52eeb7 100644
--- a/recipe/common-efi.ks.in
+++ b/recipe/common-efi.ks.in
@@ -56,31 +56,21 @@
         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
 }
-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
-  }
+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
 }
 EOF
 fi


-- 
To view, visit https://gerrit.ovirt.org/54040
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I97adfb1ed675239939a44bc9f58acf9ede03105d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at redhat.com>