X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=src%2FOOo-LiveCD.sh;h=dd707cccb7ddc752ce13d85497b455f9ad957b9d;hp=62bb06058e2296cc3305f4d962a4f70c055eda45;hb=1fc8f7d6c266e5bfd376cee3769e63b1d64f4ca4;hpb=0c185dd08de3ac0b4f09964ac274184b88edb299

diff --git a/src/OOo-LiveCD.sh b/src/OOo-LiveCD.sh
index 62bb060..dd707cc 100755
--- a/src/OOo-LiveCD.sh
+++ b/src/OOo-LiveCD.sh
@@ -36,7 +36,7 @@ if [ ! -e $ISO32 ];then
   mv -f $ISO $ISO32
 fi
 
-trap 'set +e; rm -f $BIN; (losetup -d $LOOPDEV; umount $MNT/{c,b,a,}; rmdir $MNT/{c,b,a,}) 2>/dev/null' EXIT
+trap 'set +e; rm -f $BIN; (umount $MNT/{c,b,a,}; rmdir $MNT/{c,b,a,}; losetup -d $LOOPDEV) 2>/dev/null' EXIT
 dd if=/dev/zero of=$BIN bs=1 seek=$[SIZE-1] count=1
 /sbin/parted --script $BIN mklabel msdos
 dd bs=1 if=/usr/share/syslinux/mbr.bin of=$BIN conv=notrunc
@@ -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
-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 /"`"
@@ -66,7 +66,7 @@ label detect
   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
@@ -84,6 +84,6 @@ umount $MNT/{c,b}
 mount -r -o loop $MNT/a/$BASE-i686/squashfs.img $MNT/b
 mount -r -o loop $MNT/b/LiveOS/ext3fs.img $MNT/c
 rpm -r $MNT/c -qa|sort >$MNT/a/$BASE-i686/rpm-qa
-diff -u <(sed 's/\.x86_64$//' <$MNT/a/$BASE-x86_64/rpm-qa) <(sed 's/\.i686$//' <$MNT/a/$BASE-i686/rpm-qa) || :
+diff -u <(sed 's/\.x86_64$//' <$MNT/a/$BASE-x86_64/rpm-qa) <(sed 's/\.i.86$//' <$MNT/a/$BASE-i686/rpm-qa) || :
 BIN=
 echo OK