tazlito rev 189
tazlito: no md5sum for boot/isolinux/isolinux.bin
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Dec 14 18:01:02 2010 +0100 (2010-12-14) |
parents | cc8b4e7e46b3 |
children | 0c75c957b322 |
files | tazlito |
line diff
1.1 --- a/tazlito Thu Nov 11 21:35:29 2010 +0100 1.2 +++ b/tazlito Tue Dec 14 18:01:02 2010 +0100 1.3 @@ -271,6 +271,7 @@ 1.4 cd $ROOTCD 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 status 1.9 cd $DISTRO 1.10 echo "" 1.11 @@ -305,7 +306,7 @@ 1.12 1.13 lzma_switches() 1.14 { 1.15 - echo "-d$(lzma_history_bits $1) -mt$(grep ^processor < /proc/cpuinfo | wc -l)" 1.16 + echo "-d$(lzma_history_bits $1) -mt$(grep '^processor' < /proc/cpuinfo | wc -l)" 1.17 } 1.18 1.19 # Pack rootfs 1.20 @@ -777,15 +778,16 @@ 1.21 DIR=/\${DIR#*,} 1.22 fi 1.23 mount -t tmpfs \$size tmpfs /mnt 1.24 +path2=/mnt/.httpfs/ 1.25 path=/mnt/.cdrom/ 1.26 -mkdir -p /mnt/.rw \$path 1.27 +mkdir -p /mnt/.rw \$path \$path2 1.28 while [ ! -d \$path/boot ]; do 1.29 for i in \$(echo \$URLISO | sed 's/,/ /g'); do 1.30 - httpfs \$i \$path && break 1.31 + httpfs \$i \$path2 && break 1.32 done 1.33 - mount -o loop,ro -t iso9660 \$path/*.iso \$path 1.34 + mount -o loop,ro -t iso9660 \$path2/*.iso \$path 1.35 done 1.36 -#copy_rootfs && umount -d \$path && umount -d \$path 1.37 +#copy_rootfs && umount -d \$path && umount -d \$path2 1.38 1.39 elif [ -f \$(echo /rootfs*.gz | cut -f1 -d' ') ]; then # loram-ram 1.40 1.41 @@ -849,6 +851,8 @@ 1.42 mount -o loop,ro -t squashfs \${path}root\$fs /mnt/.\$fs 1.43 fi 1.44 done 1.45 +else 1.46 +mkdir -p /mnt/.rw/mnt/.httpfs 1.47 fi 1.48 insmod /lib/aufs.ko.gz 1.49 mount -t aufs -o \$branch none /mnt