tazlito rev 275
Fix build-loram-cdrom
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed Apr 11 20:10:38 2012 +0200 (2012-04-11) |
parents | 8d040e61bef8 |
children | d38f14b8dc35 |
files | tazlito |
line diff
1.1 --- a/tazlito Tue Apr 10 22:42:37 2012 +0200 1.2 +++ b/tazlito Wed Apr 11 20:10:38 2012 +0200 1.3 @@ -240,7 +240,8 @@ 1.4 cd $2 1.5 echo -n "Computing md5..." 1.6 find * -type f ! -name md5sum -exec md5sum {} \; > md5sum 1.7 - sed -i '/ boot\/isolinux\/isolinux.bin$/d' md5sum 1.8 + sed -i -e '/ boot\/isolinux\/isolinux.bin$/d' \ 1.9 + -e '/ boot\/isolinux\/boot.cat$/d' md5sum 1.10 status 1.11 cd - > /dev/null 1.12 echo "" 1.13 @@ -996,8 +997,8 @@ 1.14 { 1.15 mkdir -p $TMP_DIR/fs 1.16 cd $TMP_DIR/fs 1.17 - for i in $TMP_DIR/iso/boot/rootfs*.gz; do 1.18 - ( zcat $i 2> /dev/null || unlzma -c $i) | cpio -idm 1.19 + for i in $(ls -r $TMP_DIR/iso/boot/rootfs*.gz); do 1.20 + ( zcat $i 2> /dev/null || unlzma -c $i) | cpio -idmu 1.21 done 1.22 rootfs=$TMP_DIR/rootfs.gz 1.23 if [ -x /usr/bin/mkcromfs ]; then 1.24 @@ -1006,7 +1007,7 @@ 1.25 /usr/sbin/mksquashfs $TMP_DIR/fs $rootfs -comp xz -Xbcj x86 1.26 fi 1.27 rm -rf $TMP_DIR/fs 1.28 - cd $TMP_DIR 1.29 + cd - > /dev/null 1.30 } 1.31 1.32 # Move meta boot configuration files to basic configuration files