tazlito rev 41
Extract moved directories from squashfs too
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Feb 21 15:15:51 2008 +0100 (2008-02-21) |
parents | edd6a8c09e3b |
children | e496599d5485 |
files | tazlito |
line diff
1.1 --- a/tazlito Wed Feb 20 14:05:21 2008 +0100 1.2 +++ b/tazlito Thu Feb 21 15:15:51 2008 +0100 1.3 @@ -443,6 +443,10 @@ 1.4 status 1.5 echo -n "Copying isolinux files..." 1.6 cp -a $TMP_DIR/boot/isolinux $TARGET/rootcd/boot 1.7 + for i in $(ls $TMP_DIR); do 1.8 + [ "$i" = "boot" ] && continue 1.9 + cp -a $TMP_DIR/$i $TARGET/rootcd 1.10 + done 1.11 status 1.12 if [ -d $TMP_DIR/boot/syslinux ]; then 1.13 echo -n "Copying syslinux files..." 1.14 @@ -472,10 +476,12 @@ 1.15 # unpack /usr 1.16 if [ -f .usr.sqfs ]; then 1.17 echo -en "\nUnsquashfs'ing /usr... " 1.18 - /sbin/unsquashfs .usr.sqfs 1.19 + sbin/unsquashfs .usr.sqfs 1.20 + rm .usr.sqfs 1.21 if [ -d squashfs-root/.moved ]; then 1.22 - ( cd squashfs-root/.moved ; find * -type f -print ) | \ 1.23 - while read $file; do 1.24 + ( cd squashfs-root/.moved ; find * -print ) | \ 1.25 + while read file; do 1.26 + [ -L $file ] || continue 1.27 rm -f $file 1.28 mv squashfs-root/.moved/$file $file 1.29 done