wok-current rev 17930
syslinux/taziso: show file result for tazpanel
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Apr 12 12:35:21 2015 +0200 (2015-04-12) |
parents | 08aeb1a2f744 |
children | a12fb1874d30 |
files | syslinux/stuff/iso2exe/taziso |
line diff
1.1 --- a/syslinux/stuff/iso2exe/taziso Sat Apr 11 18:26:44 2015 +0200 1.2 +++ b/syslinux/stuff/iso2exe/taziso Sun Apr 12 12:35:21 2015 +0200 1.3 @@ -62,6 +62,7 @@ 1.4 { 1.5 echo -n "${1:-Install filesystem}.." 1.6 touch /tmp/wait 1.7 + [ "$REQUEST_URI" ] && return 1.8 while [ -e /tmp/wait ]; do 1.9 echo -n "." > /dev/tty 1.10 sleep 1 1.11 @@ -251,6 +252,7 @@ 1.12 cp $(which mount.posixovl) $mnt/slitaz/usr/sbin 1.13 if grep -qs " $mnt " /proc/mounts && [ ! -d $mnt/boot/grub ]; then 1.14 mkdir -p $mnt/boot/grub 1.15 + echo -en "\nInstall grub in /boot/grub..." 1.16 cp -a /usr/lib/grub/*/* $mnt/boot/grub 1.17 cat > $mnt/boot/grub/menu.lst <<EOT 1.18 # /boot/grub/menu.lst: GRUB boot loader configuration. 1.19 @@ -400,7 +402,7 @@ 1.20 packages_dir= 1.21 mnt=/tmp/mnt$$ 1.22 mkdir -p $mnt 1.23 - $1 || return 1.24 + $1 $2 || return 1.25 wget -O $mnt/slitaz/boot/grldr http://mirror.slitaz.org/boot/grldr 1.26 readtazbootconf 1.27 cat > $mnt/slitaz/boot/menu.lst <<EOT 1.28 @@ -451,6 +453,7 @@ 1.29 ( cd $mnt ; zip -r9 $(basename $ISO .iso).zip slitaz ) 1.30 [ "$(which advzip)" ] && advzip -z4 $mnt/*.zip 1.31 mv $mnt/*.zip . 1.32 + ls -l $PWD/$(basename $ISO .iso).zip 1.33 umount $mnt 1.34 rm -rf $mnt 1.35 } 1.36 @@ -472,7 +475,7 @@ 1.37 inst2zip() 1.38 { 1.39 if [ "$1" ]; then 1.40 - doinstall 1.41 + mkzip doinstall 1.42 else 1.43 mkzip _install 1.44 fi 1.45 @@ -514,7 +517,7 @@ 1.46 insttaz2zip() 1.47 { 1.48 if [ "$1" ]; then 1.49 - doinstall tazusblike 1.50 + mkzip doinstall tazusblike 1.51 else 1.52 mkzip _installtaz 1.53 fi 1.54 @@ -561,6 +564,7 @@ 1.55 [ $? -eq 0 ] || return 1.56 fi 1.57 gettazboot tazboot.exe 1.58 + ls -l $PWD/tazboot.exe 1.59 } 1.60 1.61 md5() 1.62 @@ -622,6 +626,7 @@ 1.63 [ $? -eq 0 ] || return 1.64 fi 1.65 cp /media/cdrom/boot/bzImage linux.exe 1.66 + ls -l $PWD/linux.exe 1.67 } 1.68 1.69 memtest() 1.70 @@ -637,6 +642,7 @@ 1.71 [ $? -eq 0 ] || return 1.72 fi 1.73 gotcdfile 'memtest*' && cp $file memtest.exe 1.74 + ls -l $PWD/memtest.exe 1.75 } 1.76 1.77 mkfat12() 1.78 @@ -702,6 +708,7 @@ 1.79 [ $? -eq 0 ] || return 1.80 fi 1.81 cp $file $(basename $file).exe 1.82 + ls -l $PWD/$(basename $file).exe 1.83 } 1.84 1.85 fdpxe()