Fix x86_64 vs. i686.

diff --git a/src/OOo-LiveCD.sh b/src/OOo-LiveCD.sh
index 62bb060..6b936a6 100755 (executable)
--- a/src/OOo-LiveCD.sh
+++ b/src/OOo-LiveCD.sh
@@ -47,7 +47,7 @@ LOOPDEV=`losetup -o 17408 -v -f $BIN | sed 's/^Loop device is //'`
 /sbin/mkdosfs -n LIVE $LOOPDEV
 UUID="$(dd skip=$[0x43] bs=1 count=4 if=$LOOPDEV|od -An -txI|tr a-z A-Z|sed 's/^ \(....\)\(....\)$/\1-\2/')"
 # --overlay-size-mb 100 --home-size-mb 100
 /sbin/mkdosfs -n LIVE $LOOPDEV
 UUID="$(dd skip=$[0x43] bs=1 count=4 if=$LOOPDEV|od -An -txI|tr a-z A-Z|sed 's/^ \(....\)\(....\)$/\1-\2/')"
 # --overlay-size-mb 100 --home-size-mb 100

-echo | USBFS=vfat livecd-iso-to-disk --unencrypted-home --livedir $BASE-i686 $ISO32 $LOOPDEV
+echo | livecd-iso-to-disk --unencrypted-home --livedir $BASE-i686 $ISO32 $LOOPDEV

 mkdir $MNT
 mount $LOOPDEV $MNT
 CFG="`cat $MNT/syslinux/syslinux.cfg | sed 's/\( root=live:UUID=\)....-.... /\1'"$UUID /"`"
 mkdir $MNT
 mount $LOOPDEV $MNT
 CFG="`cat $MNT/syslinux/syslinux.cfg | sed 's/\( root=live:UUID=\)....-.... /\1'"$UUID /"`"


@@ -66,7 +66,7 @@ label detect
   append linux0 -- linux1
   menu default
 EOH
   append linux0 -- linux1
   menu default
 EOH

-  echo "$CFG" | sed -n                                                              -e 's/^  menu label .*$/& x86_64/' -e '/^label.*0$/,/^  append/p'
+  echo "$CFG" | sed -n -e "s/$BASE-i686/$BASE-x86_64/g"                             -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
   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