# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1468484887 -7200
# Node ID ec6aef1425c3ff358b7ac36187e688a85c1275c1
# Parent  3432c28d8372db410a95d1d7911ddb973b4d41c0
syslinux: adjust custom conf location

diff -r 3432c28d8372 -r ec6aef1425c3 syslinux/stuff/iso2exe/init
--- a/syslinux/stuff/iso2exe/init	Thu Jul 14 10:16:48 2016 +0200
+++ b/syslinux/stuff/iso2exe/init	Thu Jul 14 10:28:07 2016 +0200
@@ -680,7 +680,7 @@
 
 customsector()
 {
-	echo $(($(get 32848 "/mnt/$ISO" 4)+16))
+	echo $(get 32848 "/mnt/$ISO" 4)
 }
 
 hascustomconf()
diff -r 3432c28d8372 -r ec6aef1425c3 syslinux/stuff/iso2exe/iso2exe.c
--- a/syslinux/stuff/iso2exe/iso2exe.c	Thu Jul 14 10:16:48 2016 +0200
+++ b/syslinux/stuff/iso2exe/iso2exe.c	Thu Jul 14 10:28:07 2016 +0200
@@ -49,7 +49,7 @@
 static unsigned long getcustomsector(void)
 {
 	readsector(16UL);
-	return 16UL + LONG(buffer + 80);
+	return LONG(buffer + 80);
 }
 
 static int skipmd5 = 0;
diff -r 3432c28d8372 -r ec6aef1425c3 syslinux/stuff/iso2exe/iso2exe.sh
--- a/syslinux/stuff/iso2exe/iso2exe.sh	Thu Jul 14 10:16:48 2016 +0200
+++ b/syslinux/stuff/iso2exe/iso2exe.sh	Thu Jul 14 10:28:07 2016 +0200
@@ -205,7 +205,7 @@
 
 custom_config_sector()
 {
-	echo $(($(get 32848 "$1" 4)+16))
+	get 32848 "$1" 4
 }
 
 clear_custom_config()
@@ -497,7 +497,7 @@
 		if [ $newsz -gt $isosz ]; then
 			echo "$(($newsz - $isosz)) extra bytes."
 		else
-			echo "$(($isosz - 32768 - 2048*$(get 32848 $1 4) 
+			echo "$(($isosz - 2048*$(get 32848 $1 4) 
 				 - $(stat -c %s $DATA) - 24)) bytes free."
 		fi
 		rm -f $DATA > /dev/null
diff -r 3432c28d8372 -r ec6aef1425c3 syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Thu Jul 14 10:16:48 2016 +0200
+++ b/syslinux/stuff/iso2exe/taziso	Thu Jul 14 10:28:07 2016 +0200
@@ -854,12 +854,13 @@
 
 customsector()
 {
-	echo $(($(get 32848 "$ISO" 4)+16))
+	local c=$(echo $(get 32848 "$ISO" 4))
+	hascustomconf $(($c+16)) && echo $(($c+16)) || echo $c
 }
 
 hascustomconf()
 {
-	[ "$(ddq bs=2k skip=$(customsector) if="$ISO" | ddq bs=1 count=6)" \
+	[ "$(ddq bs=2k skip=${1:-$(customsector)} if="$ISO" | ddq bs=1 count=6)" \
 	  == "#!boot" ]
 }