wok-next rev 17671

syslinux: tiny edits
author Paul Issott <paul@slitaz.org>
date Tue Feb 17 09:13:31 2015 +0000 (2015-02-17)
parents 17e313b5b9c1
children 3ba8d2c9720d
files syslinux/stuff/iso2exe/init syslinux/stuff/iso2exe/iso2exe.sh syslinux/stuff/iso2exe/taziso
line diff
     1.1 --- a/syslinux/stuff/iso2exe/init	Tue Feb 17 09:42:47 2015 +0100
     1.2 +++ b/syslinux/stuff/iso2exe/init	Tue Feb 17 09:13:31 2015 +0000
     1.3 @@ -746,7 +746,7 @@
     1.4  	[ $? -eq 0 ] || return
     1.5  	usbdev || return
     1.6  	
     1.7 -	# perform dd in progess bar
     1.8 +	# perform dd in progress bar
     1.9  	max=$(($(cat /sys/block/loop0/size)/2048))
    1.10  	i=0; ddq if=/mnt/$ISO bs=1024k | ( 
    1.11  	while ddq bs=1024k count=1 ; do 
    1.12 @@ -757,7 +757,7 @@
    1.13  			6 70 0 > /dev/tty0 2>&1
    1.14  	done ) > $device
    1.15  
    1.16 -	# partition + fat32 format for the remining space
    1.17 +	# partition + fat32 format for the remaining space
    1.18  	get 446 $device 2 12 | xargs echo | { read dx cx ol oh ll lh 
    1.19  	if [ $dx -eq $((0x3F17)) ]; then
    1.20  		cx=$(($cx & 0xFF00))
     2.1 --- a/syslinux/stuff/iso2exe/iso2exe.sh	Tue Feb 17 09:42:47 2015 +0100
     2.2 +++ b/syslinux/stuff/iso2exe/iso2exe.sh	Tue Feb 17 09:13:31 2015 +0000
     2.3 @@ -216,7 +216,7 @@
     2.4  ELTORITOERR	No EL TORITO SPECIFICATION signature.
     2.5  CATALOGERR	Invalid boot catalog.
     2.6  HYBRIDERR	No isolinux.bin hybrid signature.
     2.7 -SUCCESSMSG	Now you can create a USB key with your .iso file.\\\\nSimply rename it to a .exe file and run it.
     2.8 +SUCCESSMSG	Now you can create a USB key with your .iso file.\\\\nSimply rename it to an .exe file and run it.
     2.9  FORCEMSG	You can add --forced to proceed anyway.
    2.10  MD5MSG		Computing md5sum...
    2.11  UNINSTALLMSG	Uninstall done.
     3.1 --- a/syslinux/stuff/iso2exe/taziso	Tue Feb 17 09:42:47 2015 +0100
     3.2 +++ b/syslinux/stuff/iso2exe/taziso	Tue Feb 17 09:13:31 2015 +0000
     3.3 @@ -262,7 +262,7 @@
     3.4  $DIALOG --clear \
     3.5  	--title " Select your Windows partition " \
     3.6  	--menu "\nPlease select the Windows partition according to its known size.
     3.7 -The datas will be kept untouched.\n" \
     3.8 +The data will be kept untouched.\n" \
     3.9  	17 70 8 \
    3.10  	$(for i in $DEV ; do
    3.11  		label="$(blkid | sed "/$i:/!d;s/.*://;s/[^ ]*UUID=[^ ]* //g;s/LABEL=//")"
    3.12 @@ -306,7 +306,7 @@
    3.13  	fi
    3.14  	cat > /tmp/dialog$$ <<EOT
    3.15  $DIALOG --clear \
    3.16 -	--title "Please select the directory with every custom packages to install." \
    3.17 +	--title "Please select the directory with every custom package to install." \
    3.18  	--cancel-label "Skip" \
    3.19  	--dselect $PWD 13 78
    3.20  EOT
    3.21 @@ -794,7 +794,7 @@
    3.22  	[ $? -eq 0 ] || return
    3.23  	usbdev || return
    3.24  	
    3.25 -	# perform dd in progess bar
    3.26 +	# perform dd in progress bar
    3.27  	max=$(($(stat -c %s $ISO)/2048))
    3.28  	i=0; ddq if=$ISO bs=1024k | ( 
    3.29  	while ddq bs=1024k count=1 ; do 
    3.30 @@ -805,7 +805,7 @@
    3.31  			6 70 0 > /dev/tty 2>&1
    3.32  	done ) > $device
    3.33  
    3.34 -	# partition + fat32 format for the remining space
    3.35 +	# partition + fat32 format for the remaining space
    3.36  	get 446 $device 2 12 | xargs echo | { read dx cx ol oh ll lh 
    3.37  	if [ $dx -eq $((0x3F17)) ]; then
    3.38  		cx=$(($cx & 0xFF00))