# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1391866145 0
# Node ID 7710488e9e49fd094d7827a74986f3c1876ad95e
# Parent  36e9807432da0c58c899ca039c1cd7f337aa713c
pppd: add /etc/ppp/ip-up.d & /etc/ppp/ip-down.d

diff -r 36e9807432da -r 7710488e9e49 ppp/receipt
--- a/ppp/receipt	Fri Feb 07 12:29:13 2014 +0000
+++ b/ppp/receipt	Sat Feb 08 13:29:05 2014 +0000
@@ -44,7 +44,7 @@
 	cp -a $install/usr/sbin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	# Config files.
-	mkdir -p $fs/etc/ppp/scripts
+	mkdir -p $fs/etc/ppp/scripts $fs/etc/ppp/ip-up.d $fs/etc/ppp/ip-down.d
 	cp $stuff/README.scripts $fs/etc/ppp
 	cp -a $src/etc.ppp/* $fs/etc/ppp
 
@@ -57,7 +57,9 @@
 	cp -a $src/scripts/callback $fs/etc/ppp/scripts
 	cp -a $src/scripts/redialer $fs/etc/ppp/scripts
 	cat >> $fs/etc/ppp/ip-up <<EOT
-if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
+if [ -x /etc/ppp/ip-up.d/\$6 ]; then
+	. /etc/ppp/ip-up.d/\$6 "\$@"
+elif [ -n "\$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
 	rm -f /etc/ppp/resolv.prev
 	if [ -f /etc/resolv.conf ]; then
 		cp /etc/resolv.conf /etc/ppp/resolv.prev
@@ -72,7 +74,9 @@
 fi
 EOT
 	cat >> $fs/etc/ppp/ip-down <<EOT
-if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
+if [ -x /etc/ppp/ip-down.d/\$6 ]; then
+	. /etc/ppp/ip-down.d/\$6 "\$@"
+elif [ -n "\$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
 	if [ -f /etc/ppp/resolv.prev ]; then
 		cp -f /etc/ppp/resolv.prev /etc/resolv.conf
 		chmod 644 /etc/resolv.conf
@@ -83,7 +87,7 @@
 EOT
 	# cp -a $src/scripts/ip-up.local.add $fs/etc/ppp/ip-up
 	# cp -a $src/scripts/ip-down.local.add $fs/etc/ppp/ip-down
-	chmod 711 $fs/etc/ppp/ip*
+	chmod 711 $fs/etc/ppp/ip-up $fs/etc/ppp/ip-down
 
 	# insert #!/bin/sh  on top line in ip* scripts
 	sed -i '1i\#!/bin/sh' $fs/etc/ppp/ip*	
diff -r 36e9807432da -r 7710488e9e49 tinc/receipt
--- a/tinc/receipt	Fri Feb 07 12:29:13 2014 +0000
+++ b/tinc/receipt	Sat Feb 08 13:29:05 2014 +0000
@@ -32,5 +32,6 @@
 {
 	mkdir -p $fs/usr
 	cp -a $install/usr/sbin $fs/usr
+	cp -a $stuff/* $fs
 }
 
diff -r 36e9807432da -r 7710488e9e49 tinc/stuff/etc/init.d/tinc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tinc/stuff/etc/init.d/tinc	Sat Feb 08 13:29:05 2014 +0000
@@ -0,0 +1,55 @@
+#!/bin/sh
+# /etc/init.d/tinc: Start, stop and restart tinc deamon on SliTaz, at boot
+# time or with the command line.
+#
+# To start daemon at boot time, just put the right name in the $RUN_DAEMONS
+# variable of /etc/rcS.conf and configure options with /etc/daemons.conf.
+#
+. /etc/init.d/rc.functions
+. /etc/daemons.conf
+
+NAME=tinc
+DESC="tinc deamon"
+DAEMON=/usr/sbin/tincd
+OPTIONS=$TINC_OPTIONS
+PIDFILE=/var/run/tinc.pid
+
+case "$1" in
+  start)
+    if active_pidfile $PIDFILE tincd ; then
+      echo "$NAME already running."
+      exit 1
+    fi
+    echo -n "Starting $DESC: $NAME... "
+    $DAEMON $OPTIONS 
+    status
+    ;;
+  stop)
+    if ! active_pidfile $PIDFILE tincd ; then
+      echo "$NAME is not running."
+      exit 1
+    fi
+    echo -n "Stopping $DESC: $NAME... "
+    $DAEMON -k 
+    status
+    ;;
+  restart)
+    if ! active_pidfile $PIDFILE tincd ; then
+      echo "$NAME is not running."
+      exit 1
+    fi
+    echo -n "Restarting $DESC: $NAME... "
+    $DAEMON -k 
+    sleep 2
+    $DAEMON $OPTIONS
+    status
+    ;;
+  *)
+    echo ""
+    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|reload|restart]"
+    echo ""
+    exit 1
+    ;;
+esac
+
+exit 0