From: jkratoch <>
Date: Thu, 30 Dec 2010 22:39:42 +0000 (+0000)
Subject: Fix i686 boot.
X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=0c185dd08de3ac0b4f09964ac274184b88edb299

Fix i686 boot.
---

diff --git a/src/OOo-LiveCD.sh b/src/OOo-LiveCD.sh
index a1a0f69..62bb060 100755
--- a/src/OOo-LiveCD.sh
+++ b/src/OOo-LiveCD.sh
@@ -66,8 +66,8 @@ label detect
   append linux0 -- linux1
   menu default
 EOH
-  echo "$CFG" | sed -n                            -e 's/^  menu label .*$/& x86_64/' -e 's/^  append.*$/& live_dir='"$BASE-x86_64/" -e '/^label.*0$/,/^  append/p'
-  echo "$CFG" | sed -n -e 's/^\(label.*\)0$/\11/' -e 's/^  menu label .*$/& i686/'   -e 's/^  append.*$/& live_dir='"$BASE-i686/"   -e '/^label.*1$/,/^  append/p'
+  echo "$CFG" | sed -n                                                              -e 's/^  menu label .*$/& x86_64/' -e '/^label.*0$/,/^  append/p'
+  echo "$CFG" | sed -n -e 's/^\(label.*\)0$/\11/' -e 's/\(vmlinuz\|initrd\)0/\11/g' -e 's/^  menu label .*$/& i686/'   -e '/^label.*1$/,/^  append/p'
   echo "$CFG" | sed -n '/^label mem/,$p'
 ) >$MNT/syslinux/syslinux.cfg
 cp -p $SELF $MNT/