From d20dd39fa08da3ef262c95ece5548c952c257bf7 Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Wed, 11 Apr 2012 19:42:13 +0200
Subject: Remove obsolete references to /etc/rc.conf

Configuration is done through /etc/conf.d/netcfg.
Compatibility with configuration through /etc/rc.conf is dropped.
---
 contrib/pm-utils.handler          | 1 -
 scripts/netcfg-wpa_actiond        | 1 -
 src/network                       | 3 +--
 systemd/net-auto-wired.service    | 1 -
 systemd/net-auto-wireless.service | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/contrib/pm-utils.handler b/contrib/pm-utils.handler
index 79cad6a..3db87a0 100755
--- a/contrib/pm-utils.handler
+++ b/contrib/pm-utils.handler
@@ -4,7 +4,6 @@
 
 [[ -f /usr/lib/network/network ]] || exit $NA
 . /usr/lib/network/network
-. /etc/rc.conf
 . /etc/conf.d/netcfg
 
 WIRELESS_INTERFACE=${WIRELESS_INTERFACE:-wlan0}
diff --git a/scripts/netcfg-wpa_actiond b/scripts/netcfg-wpa_actiond
index 48bf48a..72f3231 100755
--- a/scripts/netcfg-wpa_actiond
+++ b/scripts/netcfg-wpa_actiond
@@ -2,7 +2,6 @@
 . /usr/lib/network/network
 . "$SUBR_DIR/8021x"
 . "$SUBR_DIR/rfkill"
-. /etc/rc.conf
 . /etc/conf.d/netcfg
 
 AUTOWIFI="/usr/sbin/wpa_actiond -p /run/wpa_supplicant"
diff --git a/src/network b/src/network
index 9bdd720..ce5e962 100644
--- a/src/network
+++ b/src/network
@@ -113,9 +113,8 @@ profile_up()
         exit 1
     fi
 
-    # NETWORKS_EXCLUSIVE, rc.conf: Profiles are globally mutually exclusive
     # EXCLUSIVE, network.d/profile: Individual profile is mutually exclusive
-    if checkyesno "$NETWORKS_EXCLUSIVE" || checkyesno "$EXCLUSIVE"; then
+    if checkyesno "$EXCLUSIVE"; then
         all_down
     fi
 
diff --git a/systemd/net-auto-wired.service b/systemd/net-auto-wired.service
index 321a62e..f611a89 100644
--- a/systemd/net-auto-wired.service
+++ b/systemd/net-auto-wired.service
@@ -3,7 +3,6 @@ Description=Provides automatic netcfg wired connection
 Before=network.target
 
 [Service]
-EnvironmentFile=/etc/rc.conf
 EnvironmentFile=/etc/conf.d/netcfg
 EnvironmentFile=-/etc/ifplugd/ifplugd.conf
 ExecStart=-/usr/sbin/ifplugd -i $WIRED_INTERFACE -r /etc/ifplugd/netcfg.action -fIn -u0 -d10
diff --git a/systemd/net-auto-wireless.service b/systemd/net-auto-wireless.service
index 6f7a8c0..c2ea4f8 100644
--- a/systemd/net-auto-wireless.service
+++ b/systemd/net-auto-wireless.service
@@ -3,7 +3,6 @@ Description=Provides automatic netcfg wireless connection
 Before=network.target
 
 [Service]
-EnvironmentFile=/etc/rc.conf
 EnvironmentFile=/etc/conf.d/netcfg
 ExecStart=/usr/bin/netcfg-wpa_actiond $WIRELESS_INTERFACE
 ExecStop=/usr/bin/netcfg-wpa_actiond stop $WIRELESS_INTERFACE
-- 
cgit v1.2.3-24-g4f1b