From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 3 Jun 2010 21:28:37 +0000 (+0200)
Subject: network: Handle pppd ip-up and ip-down events sober in hook.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0064e474130c557aed7564ba6e1d748e46dc04ec;p=ipfire-3.x.git

network: Handle pppd ip-up and ip-down events sober in hook.
---

diff --git a/pkgs/core/network/src/header-zone b/pkgs/core/network/src/header-zone
index 30cb5f277..3ece84863 100644
--- a/pkgs/core/network/src/header-zone
+++ b/pkgs/core/network/src/header-zone
@@ -223,6 +223,19 @@ function _config_show() {
 	_notimplemented _config_show
 }
 
+# These tree functions exit silently
+function _ppp-ip-pre-up() {
+	exit ${EXIT_OK}
+}
+
+function _ppp-ip-up() {
+	exit ${EXIT_OK}
+}
+
+function _ppp-ip-down() {
+	exit ${EXIT_OK}
+}
+
 function run() {
 	case "${action}" in
 		create|discover|down|edit|info|rem|status|up)
@@ -247,6 +260,10 @@ function run() {
 			_config $@
 			;;
 
+		ppp-ip-pre-up|ppp-ip-up|ppp-ip-down)
+			_${action} $@
+			;;
+
 	esac
 
 	error "Hook did not exit properly."
diff --git a/pkgs/core/network/src/ppp/ip-updown b/pkgs/core/network/src/ppp/ip-updown
index b5bf989bc..d03e93216 100755
--- a/pkgs/core/network/src/ppp/ip-updown
+++ b/pkgs/core/network/src/ppp/ip-updown
@@ -39,4 +39,4 @@ if ! hook_exists ${HOOK}; then
 	exit ${EXIT_ERROR}
 fi
 
-hook_exec ${HOOK} $(basename ${0}) ${ZONE}
+hook_exec ${HOOK} ppp-$(basename ${0}) ${ZONE}