SliTaz Repositories

     1.1 --- a/syslinux/stuff/iso2exe/iso2exe.sh	Mon Dec 29 18:33:00 2014 +0100
     1.2 +++ b/syslinux/stuff/iso2exe/iso2exe.sh	Thu Jan 01 22:09:19 2015 +0100
     1.3 @@ -20,7 +20,11 @@
     1.4  
     1.5  compress()
     1.6  {
     1.7 -	if [ "$(which xz 2> /dev/null)" ]; then
     1.8 +	if [ "$1" ]; then
     1.9 +		gzip -9 > $1
    1.10 +		[ "$(which advdef 2> /dev/null)" ] &&
    1.11 +		advdef -z4 $1 > /dev/null
    1.12 +	elif [ "$(which xz 2> /dev/null)" ]; then
    1.13  		xz -z -e --format=lzma --lzma1=mode=normal --stdout
    1.14  	else
    1.15  		lzma e -si -so
    1.16 @@ -33,12 +37,16 @@
    1.17  	mkdir -p $TMP/bin $TMP/dev
    1.18  	cp -a /dev/?d?* /dev/tty /dev/tty0 $TMP/dev
    1.19  	$0 --get init > $TMP/init.exe
    1.20 -	grep -q mount.posixovl.iso2exe $TMP/init.exe &&
    1.21 -	cp /usr/sbin/mount.posixovl $TMP/bin/mount.posixovl.iso2exe \
    1.22 -		2> /dev/null && echo "Store mount.posixovl ($(wc -c \
    1.23 -			< /usr/sbin/mount.posixovl) bytes) ..."
    1.24 +#	mount -o loop,ro $1 $TMP
    1.25 +#	oldslitaz="$(ls $TMP/boot/isolinux/splash.lss 2> /dev/null)"
    1.26 +#	umount -d $TMP
    1.27 +#	[ "$oldslitaz" ] && # for SliTaz <= 3.0 only...
    1.28 +#	grep -q mount.posixovl.iso2exe $TMP/init.exe &&
    1.29 +#	cp /usr/sbin/mount.posixovl $TMP/bin/mount.posixovl.iso2exe \
    1.30 +#		2> /dev/null && echo "Store mount.posixovl ($(wc -c \
    1.31 +#			< /usr/sbin/mount.posixovl) bytes) ..."
    1.32  	find $TMP -type f -print0 | xargs -0 chmod +x
    1.33 -	( cd $TMP ; find * | cpio -o -H newc ) | compress > $TMP/rootfs.gz
    1.34 +	( cd $TMP ; find * | cpio -o -H newc ) | compress $TMP/rootfs.gz
    1.35  	SIZE=$(wc -c < $TMP/rootfs.gz)
    1.36  	store 24 $SIZE $1
    1.37  	OFS=$(( $OFS - $SIZE ))
    1.38 @@ -66,7 +74,6 @@
    1.39  
    1.40  add_win32exe()
    1.41  {
    1.42 -	ddq if=/tmp/exe$$ of=$1 conv=notrunc
    1.43  	SIZE=$($0 --get win32.exe 2> /dev/null | tee /tmp/exe$$ | wc -c)
    1.44  	printf "Adding WIN32 file at %04X (%d bytes) ...\n" 0 $SIZE
    1.45  	ddq if=/tmp/exe$$ of=$1 conv=notrunc
    1.46 @@ -209,7 +216,7 @@
    1.47  	esac
    1.48  	case "$(get 0 $1)" in
    1.49  	23117)	echo "The file $1 is already an EXE file." 1>&2 && exit 1;;
    1.50 -	0)	[ -x /usr/bin/isohybrid ] && isohybrid $1 && echo "Do isohybrid"
    1.51 +	0)	$0 --get isohdpfx.bin | ddq bs=512 count=1 of=$1 conv=notrunc
    1.52  	esac
    1.53  		
    1.54  	echo "Read hybrid & tazlito data..."