wok diff syslinux/stuff/iso2exe/iso2exe.sh @ rev 18802

syslinux/iso2exe.sh: fix clear_custom_config
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Jan 12 15:40:40 2016 +0100 (2016-01-12)
parents ec7b15533c2d
children 67f5b3bae0a8
line diff
     1.1 --- a/syslinux/stuff/iso2exe/iso2exe.sh	Fri Jan 01 21:39:40 2016 +0100
     1.2 +++ b/syslinux/stuff/iso2exe/iso2exe.sh	Tue Jan 12 15:40:40 2016 +0100
     1.3 @@ -292,7 +292,7 @@
     1.4  
     1.5  main()
     1.6  {
     1.7 -	[ $(id -u) -ne 0 ] && exec su -c "$0 $@" < /dev/tty
     1.8 +	[ $(id -u) -ne 0 ] && cmd="$0 $@" && exec su -c "$cmd" < /dev/tty
     1.9  	append=
    1.10  	initrd=
    1.11  	while [ "$1" ]; do
    1.12 @@ -325,11 +325,11 @@
    1.13  		ddq if=/dev/zero bs=1 seek=$n count=$((0x8000 - $n)) of=$1 conv=notrunc ;;
    1.14  	    *)  ddq if=/dev/zero bs=1k count=32 of=$1 conv=notrunc ;;
    1.15  	    esac
    1.16 -	    clear_custom_config
    1.17 +	    clear_custom_config $1
    1.18  	    exit 0 ;;
    1.19  	-f*)
    1.20  	    ddq if=/dev/zero bs=1k count=32 of=$1 conv=notrunc
    1.21 -	    [ "$append$initrd" ] && clear_custom_config
    1.22 +	    [ "$append$initrd" ] && clear_custom_config $1
    1.23  	esac
    1.24  	case "$(get 0 $1)" in
    1.25  	23117)	echo "The file $1 is already an EXE file." 1>&2 && exit 1;;