git://git.jankratochvil.net
/
nethome.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dba0d56
)
Fix cleanup and diff.
author
jkratoch
<>
Fri, 31 Dec 2010 21:58:53 +0000
(21:58 +0000)
committer
jkratoch
<>
Fri, 31 Dec 2010 21:58:53 +0000
(21:58 +0000)
src/OOo-LiveCD.sh
patch
|
blob
|
history
diff --git
a/src/OOo-LiveCD.sh
b/src/OOo-LiveCD.sh
index
6b936a6
..
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
@@
-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