[node-patches] Change in ovirt-node[master]: Re-add basic video options to installer

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Re-add basic video options to installer
......................................................................

Re-add basic video options to installer

Spurious removal

Change-Id: Ie9121d9eb407d16b13f0e35e923373a42f78adb2
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M recipe/common-efi.ks
M recipe/common-nochroot.ks
2 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/44/36644/1

diff --git a/recipe/common-efi.ks b/recipe/common-efi.ks
index e448caf..1ba6fd4 100644
--- a/recipe/common-efi.ks
+++ b/recipe/common-efi.ks
@@ -13,12 +13,18 @@
 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
   initrd /isolinux/initrd0.img
diff --git a/recipe/common-nochroot.ks b/recipe/common-nochroot.ks
index a519f7d..b52d773 100644
--- a/recipe/common-nochroot.ks
+++ b/recipe/common-nochroot.ks
@@ -32,6 +32,10 @@
 }
 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"
@@ -40,6 +44,10 @@
   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/36644
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9121d9eb407d16b13f0e35e923373a42f78adb2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>