[node-patches] Change in ovirt-node[master]: Be more clever removing basic video options

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Be more clever removing basic video options
......................................................................

Be more clever removing basic video options

isolinux appears to just inherit the next label if there's an
unlabeled entry, instead of leaving it out. Pass it through
grepping the appropriate number of surrounding lines and diff it
out to get a clean isolinux.

https://bugzilla.redhat.com/show_bug.cgi?id=1167768

Change-Id: Ia84bc10f3d44add137e51a8445cd7b6842183243
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M recipe/common-nochroot.ks
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/46/36746/1

diff --git a/recipe/common-nochroot.ks b/recipe/common-nochroot.ks
index b52dbb7..3d9a9dd 100644
--- a/recipe/common-nochroot.ks
+++ b/recipe/common-nochroot.ks
@@ -22,7 +22,10 @@
 
 # Rename Boot option to Install or Upgrade
 sed -i 's/^  menu label Boot$/  menu label Install or Upgrade/' $LIVE_ROOT/isolinux/isolinux.cfg
-sed -i '/^  menu label Boot (Basic Video)$/d' $LIVE_ROOT/isolinux/isolinux.cfg
+grep -A2 -B1 -E "^  menu label Boot \(Basic Video\)" /tmp/isolinux.cfg  | \
+    diff - /tmp/isolinux.cfg  | sed '/^[^>]/d;s/^> //;' > $LIVE_ROOT/isolinux/isolinux.cfg.tmp
+mv $LIVE_ROOT/isolinux/isolinux.cfg.tmp $LIVE_ROOT/isolinux/isolinux.cfg
+
 
 # add serial console boot entry
 menu=$(mktemp)


-- 
To view, visit http://gerrit.ovirt.org/36746
To unsubscribe, visit http://gerrit.ovirt.org/settings

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