[gentoo-commits] proj/netifrc:master commit in: udev_helper/

["Robin H. Johnson" <robbat2@gentoo.org>]

commit:     c10f1f89c55d075bf5be50b6b75431252cf5952e
Author:     Samuli Suominen <ssuominen <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  7 17:34:48 2014 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  7 17:36:03 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=c10f1f89

udev_helper: do not run with newnet

If the system is using newnet, then we should not run to fire the
netifrc triggers.

X-Gentoo-Bug: 503530
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 udev_helper/net.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/udev_helper/net.sh b/udev_helper/net.sh
index af61870..88aee59 100644
--- a/udev_helper/net.sh
+++ b/udev_helper/net.sh
@@ -16,6 +16,20 @@ case ${IFACE} in
 		exit 0 ;;
 esac
 
+is_service_enabled() {
+	local svc="$1"
+	[ ! -e "/etc/init.d/${svc}" ] && return 1
+	[ -e "/etc/runlevels/boot/${svc}" ] && return 0
+	[ -e "/etc/runlevels/default/${svc}" ] && return 0
+	[ -e "/etc/runlevels/sysinit/${svc}" ] && return 0
+	return 1
+}
+
+# stop here if OpenRC's so called "newnet" is enabled, bug #503530
+if is_service_enabled network; then
+	exit 0
+fi
+
 # stop here if coldplug is disabled, Bug #206518
 if [ "${do_not_run_plug_service}" = 1 ]; then
 	exit 0