If SVCNAME does not exist avoid doing service magic

Package-Manager: portage-2.1.4

4 files changed, 32 insertions, 35 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index b1932e33cdcf..76aae27198aa 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.122 2008/01/29 15:07:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.123 2008/01/30 15:05:25 alonbl Exp $
+
+  30 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org> files/down.sh, files/up.sh:
+  If SVCNAME does not exist avoid doing service magic
 
   29 Jan 2008; Diego Pettenò <flameeyes@gentoo.org> files/openvpn-2.1.init,
   files/openvpn.init:
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 8e391ae71f0d..d3bf855c7daf 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX down.sh 906 RMD160 9ef2461c0b2a7035b1bc2da3f33e38aac5ed2bb9 SHA1 484a07fdf86a921e768c47948361347f243ca77f SHA256 a09760aa53d53d6bbbe45798ea953c73a8c9bc08f8e014c08342717e617ac864
-MD5 2b71b4daa1f7eca916729abe34839068 files/down.sh 906
-RMD160 9ef2461c0b2a7035b1bc2da3f33e38aac5ed2bb9 files/down.sh 906
-SHA256 a09760aa53d53d6bbbe45798ea953c73a8c9bc08f8e014c08342717e617ac864 files/down.sh 906
+AUX down.sh 943 RMD160 db43a525c9eb2ccb538e938e0b7f4359af22e4de SHA1 261acc68a24108526345a7d117bba15dbcebaa6e SHA256 39debebcd8c899f20e6d355cbc8eaab46e28b83a9f6c33a94c065688a4f3d2c7
+MD5 dc3ff0bae442b9aedd947b8ffda1687a files/down.sh 943
+RMD160 db43a525c9eb2ccb538e938e0b7f4359af22e4de files/down.sh 943
+SHA256 39debebcd8c899f20e6d355cbc8eaab46e28b83a9f6c33a94c065688a4f3d2c7 files/down.sh 943
 AUX openvpn-2.0.7-pam.patch 1236 RMD160 3f9035a7005b206e1447dfd75edcb65cb5531b2d SHA1 09c362da6cea1d6f7e6ff060a4e92493a5b34cba SHA256 b5906cc1bff00ebc3dc9a58861388493aa6d2be774dbacba63c2cfcc8bfa4f92
 MD5 968e83fbca1dca7d68c60aacdb51b6be files/openvpn-2.0.7-pam.patch 1236
 RMD160 3f9035a7005b206e1447dfd75edcb65cb5531b2d files/openvpn-2.0.7-pam.patch 1236
@@ -33,10 +30,10 @@ AUX openvpn.init 1488 RMD160 be34debb55b6c3e2453946a290da2650ca3baa72 SHA1 48aab
 MD5 10390247d1fdc4fd1ebec1ebae8872be files/openvpn.init 1488
 RMD160 be34debb55b6c3e2453946a290da2650ca3baa72 files/openvpn.init 1488
 SHA256 c074126c90d35c04a7316f4533cd00e9e14849e4e222ca5b87e6172f401ec95d files/openvpn.init 1488
-AUX up.sh 2519 RMD160 31c6358f1d96233061e305bc4bba0287f9af5c63 SHA1 9e685b4b2c2d47a7196819ca8f9f2edb35e462ff SHA256 2fe2af698d096950cce6c285d890b14821eb829546151fb8f1c5413f1235a8bd
-MD5 2b0aee7aa1112a6e2eed430bb774e625 files/up.sh 2519
-RMD160 31c6358f1d96233061e305bc4bba0287f9af5c63 files/up.sh 2519
-SHA256 2fe2af698d096950cce6c285d890b14821eb829546151fb8f1c5413f1235a8bd files/up.sh 2519
+AUX up.sh 2560 RMD160 34c2f0845a2c3b2eebb20da5a5c316e81cd1ef5a SHA1 d7026eeb7586fb931e5f938ca00fcc63c63923ad SHA256 3a7cedba5909fa06d0eb36b3426f0e5bc21bdc28943beaaa241ab651b4388218
+MD5 4ea7db1751a528f9ef9afb1c49ea4954 files/up.sh 2560
+RMD160 34c2f0845a2c3b2eebb20da5a5c316e81cd1ef5a files/up.sh 2560
+SHA256 3a7cedba5909fa06d0eb36b3426f0e5bc21bdc28943beaaa241ab651b4388218 files/up.sh 2560
 DIST openvpn-2.0.6.tar.gz 664816 RMD160 cf3cd807bb657baf317e896b57900958cf442a63 SHA1 046f3811831a06e4fbc9c64544faaecf04547ae5 SHA256 1074c9fb5a7881e6d4ff0b125cf1e44a9fb650beef187f061785698522453003
 DIST openvpn-2.0.7.tar.gz 665129 RMD160 b89f6df5ff08326f4e07e6cd4abda633627ef9e4 SHA1 74a4d19e42ca226f50ab5bdba16aa4a130c5e431 SHA256 9e29ebfb76375379b4ca12c2270dff3b4b1636eb643747c69249ae206833052e
 DIST openvpn-2.1-udp6.patch.bz2 16625 RMD160 58f7fa1e9eebdfb267782f409b162e84f227faf8 SHA1 cb13e4f7dd973bb782e2bd5cc9a59f5f5bcb3ef0 SHA256 e98bd77e3098a203b23dde34847ba9647f8f0c75d432559d1c3fb1e9ada66322
@@ -58,10 +55,10 @@ EBUILD openvpn-2.1_rc6-r1.ebuild 4388 RMD160 2b5df040bee307f53f4fef36b3bbf04dcaa
 MD5 aec8143a9e32e606f6d55952e3eb22f4 openvpn-2.1_rc6-r1.ebuild 4388
 RMD160 2b5df040bee307f53f4fef36b3bbf04dcaaa173e openvpn-2.1_rc6-r1.ebuild 4388
 SHA256 264235f0a8ef1641feb8591721a50fdbfd6ec8fece0a5140b89553b25e47fb1a openvpn-2.1_rc6-r1.ebuild 4388
-MISC ChangeLog 19575 RMD160 e787c10aac7eda2235014d2cb9b02930679b4d98 SHA1 e23726f51cefbdcafbc05f633aa034a949b1f045 SHA256 f5c9eda15a7e2ab8c477638afb95026c840cac9eb54e3c78add77138593f08aa
-MD5 e65ad5ed2ba5078d9e6685e32378e67f ChangeLog 19575
-RMD160 e787c10aac7eda2235014d2cb9b02930679b4d98 ChangeLog 19575
-SHA256 f5c9eda15a7e2ab8c477638afb95026c840cac9eb54e3c78add77138593f08aa ChangeLog 19575
+MISC ChangeLog 19703 RMD160 5c15b0c13622d89a94856f79a7a9695075936821 SHA1 6aaaf6ea2ca7acb344a7b4b9a90c02c7b0015c25 SHA256 efe1aedc4247084cd45476545d8bd1c2c96ea8c2b4b9c052bf31506acdb732f7
+MD5 77e5d9eb1253d39c33ea6051f99a00ff ChangeLog 19703
+RMD160 5c15b0c13622d89a94856f79a7a9695075936821 ChangeLog 19703
+SHA256 efe1aedc4247084cd45476545d8bd1c2c96ea8c2b4b9c052bf31506acdb732f7 ChangeLog 19703
 MISC metadata.xml 439 RMD160 f706dea5fbe921385d0e2572e8c1f170fdad59f9 SHA1 ce672f573bf5e2a79fa0aed9c4db6a283c94705d SHA256 f9206f410231c68498f39bc887dbd00a3170ae1a0ede8e89adcce27745017baf
 MD5 cd62c31fec8f65e0a3a3080c5ad9775f metadata.xml 439
 RMD160 f706dea5fbe921385d0e2572e8c1f170fdad59f9 metadata.xml 439
@@ -78,10 +75,3 @@ SHA256 9f61a1d35bb0c7fe056674478f0251d6ed6cbc19f409c0b8aa2cd6d28e3d7900 files/di
 MD5 663f2896a21eed4e4c9888049d0b5adf files/digest-openvpn-2.1_rc6-r1 247
 RMD160 87c0972c58afa9137808c467dd041c5b796051b2 files/digest-openvpn-2.1_rc6-r1 247
 SHA256 5ba36bc0cd0d7e06d68d3a9a842d558b7ee4bc0b574bbcb8233227aad7e251fe files/digest-openvpn-2.1_rc6-r1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHn0E9AiZjviIA2XgRAhm9AJ4myvBaqQaP9OEahRr+/6eGgUphdwCdEQfE
-mvQe+mqdk7UCi+BI/d0BjYQ=
-=FPP3
------END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/files/down.sh b/net-misc/openvpn/files/down.sh
index 1c5885311b39..1c70db0ec653 100755
--- a/net-misc/openvpn/files/down.sh
+++ b/net-misc/openvpn/files/down.sh
@@ -20,10 +20,12 @@ if [ "${PEER_DNS}" != "no" ]; then
 	fi
 fi
 
-# Re-enter the init script to start any dependant services
-if /etc/init.d/"${SVCNAME}" --quiet status ; then
-	export IN_BACKGROUND=true
-	/etc/init.d/"${SVCNAME}" --quiet stop
+if [ -n "${SVCNAME}" ]; then
+	# Re-enter the init script to start any dependant services
+	if /etc/init.d/"${SVCNAME}" --quiet status ; then
+		export IN_BACKGROUND=true
+		/etc/init.d/"${SVCNAME}" --quiet stop
+	fi
 fi
 
 exit 0
diff --git a/net-misc/openvpn/files/up.sh b/net-misc/openvpn/files/up.sh
index ae28712feb63..d0879b83c08d 100755
--- a/net-misc/openvpn/files/up.sh
+++ b/net-misc/openvpn/files/up.sh
@@ -64,15 +64,17 @@ fi
 # Quick summary - our init scripts are re-entrant and set the SVCNAME env var
 # as we could have >1 openvpn service
 
-# If we have a service specific script, run this now
-if [ -x /etc/openvpn/"${SVCNAME}"-up.sh ] ; then
-	/etc/openvpn/"${SVCNAME}"-up.sh "$@"
-fi
+if [ -n "${SVCNAME}" ]; then
+	# If we have a service specific script, run this now
+	if [ -x /etc/openvpn/"${SVCNAME}"-up.sh ] ; then
+		/etc/openvpn/"${SVCNAME}"-up.sh "$@"
+	fi
 
-# Re-enter the init script to start any dependant services
-if ! /etc/init.d/"${SVCNAME}" --quiet status ; then
-	export IN_BACKGROUND=true
-	/etc/init.d/${SVCNAME} --quiet start
+	# Re-enter the init script to start any dependant services
+	if ! /etc/init.d/"${SVCNAME}" --quiet status ; then
+		export IN_BACKGROUND=true
+		/etc/init.d/${SVCNAME} --quiet start
+	fi
 fi
 
 exit 0