# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1439539608 -7200
# Node ID db66c997923aa4355c16354af4e9d8709d311661
# Parent  cf37d3c0b711a6a5cf959ed4ad011168f67353d9
knock: set default interface

diff -r cf37d3c0b711 -r db66c997923a knock/stuff/etc/init.d/knock
--- a/knock/stuff/etc/init.d/knock	Thu Aug 13 00:47:16 2015 +0300
+++ b/knock/stuff/etc/init.d/knock	Fri Aug 14 10:06:48 2015 +0200
@@ -13,7 +13,8 @@
 DAEMON=/usr/sbin/knockd
 OPTIONS=$KNOCK_OPTIONS
 PIDFILE=/var/run/knockd.pid
-[ -n "$OPTIONS" ] || OPTIONS="-d"
+IFACE="$(route -n | awk '{ if ($1 == "0.0.0.0" && $3 == $1) print $8}')"
+[ -n "$OPTIONS" ] || OPTIONS="-d -i ${IFACE:-eth0}"
 
 case "$1" in
   start)
diff -r cf37d3c0b711 -r db66c997923a syslinux/stuff/iso2exe/init
--- a/syslinux/stuff/iso2exe/init	Thu Aug 13 00:47:16 2015 +0300
+++ b/syslinux/stuff/iso2exe/init	Fri Aug 14 10:06:48 2015 +0200
@@ -975,13 +975,15 @@
 which $DIALOG 2> /dev/null || DIALOG=tinydialog
 dmesg > /tmp/dmesg
 
+isotitle="$(basename $ISO)  $(stat -c %y /cdrom/media/. | sed 's/ .*//'\
+	  )  $(blkid /mnt/$ISO | sed 's/.*LABEL="\([^"]*\).*/\1/')"
 while true; do
 	trap shell 2 
 	keymap="$(cat /etc/keymap.conf 2> /dev/null)"
 	locale="$(sed '/^LANG=/!d;s/.*=//' /etc/locale.conf 2> /dev/null)"
 	cat > /tmp/dialog <<EOT
 $DIALOG  --clear \
-	--title " Welcome to Linux " \
+	--title " ${isotitle:-Welcome to Linux} " \
 	--menu "" 23 70 17 \
 $(xfile tazkeymap	"tazkeymap"	"Select keyboard (${keymap:-none})") \
 $(xfile tazlocale	"tazlocale"	"Select locale (${locale:-none})") \
diff -r cf37d3c0b711 -r db66c997923a syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Thu Aug 13 00:47:16 2015 +0300
+++ b/syslinux/stuff/iso2exe/taziso	Fri Aug 14 10:06:48 2015 +0200
@@ -1208,6 +1208,12 @@
 	${1:-exit}
 }
 
+isotitle()
+{
+	echo "$(basename $ISO)  $(stat -c %y $media/.|sed 's/ .*//')  $(blkid \
+		$ISO | sed 's/.*LABEL="\([^"]*\).*/\1/')"
+}
+
 ISO="${1:-/dev/null}"
 [ -z "$(isiso 2> /dev/null)" ] && echo "Usage : $0 file.iso" && exit 1
 media=/tmp/madia$$
@@ -1226,6 +1232,7 @@
 	shift 2
 	if [ -n "$(eval $(grep "\"$exe\"" $0 | sed \
 		   '/^\$/!d;s/.(\(.*\)[\t ]*".*"[\t ]*".*/\1/'))" ]; then
+		isotitle
 		grep "\"$exe\"" $0 | sed '/^\$/!d;s/.*"[\t ]*"\(.*\)".*/\1/'
 		echo ----
 		$exe "$@"
@@ -1236,7 +1243,7 @@
 while true; do
 	cat > /tmp/dialog$$ <<EOT
 $DIALOG  --clear \
-	--title " $(basename $ISO)  $(stat -c %y $media/. | sed 's/ .*//') " \
+	--title " $(isotitle) " \
 	--menu "" -2 70 0 \
 $(cdfile 'README*'	"readme"	"Show the README file") \
 $(gotisomd5		"isomd5"	"Check the ISO image") \