git://git.jankratochvil.net
/
nethome.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
+IdentityFile ~/.ssh/id_dsa-sourceware
[nethome.git]
/
src
/
OOo-LiveCD.sh
diff --git
a/src/OOo-LiveCD.sh
b/src/OOo-LiveCD.sh
index
a1a0f69
..
dd707cc
100755
(executable)
--- a/
src/OOo-LiveCD.sh
+++ b/
src/OOo-LiveCD.sh
@@
-36,7
+36,7
@@
if [ ! -e $ISO32 ];then
mv -f $ISO $ISO32
fi
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
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
/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,8
+66,8
@@
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 '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/$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
cp -p $SELF $MNT/
echo "$CFG" | sed -n '/^label mem/,$p'
) >$MNT/syslinux/syslinux.cfg
cp -p $SELF $MNT/
@@
-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
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/\.i
6
86$//' <$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
BIN=
echo OK