summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2012-12-30 17:59:57 +0100
committerJouke Witteveen <j.witteveen@gmail.com>2012-12-30 17:59:57 +0100
commit454d7b63d70895ca8278c439ce75775d58c9ed6f (patch)
tree20f774cc30728f57d27e84430245fa963bb2fde2
parentcb6404f27347226bc8c30ac432c808729964232d (diff)
downloadnetctl-454d7b63d70895ca8278c439ce75775d58c9ed6f.tar.gz
netctl-454d7b63d70895ca8278c439ce75775d58c9ed6f.tar.xz
Forgotten lines on automatic connection scripts
- The services now bind to their interfaces correctly. - Documentation of ExcludeAuto is added.
-rw-r--r--docs/netctl.profile.5.txt4
-rw-r--r--services/netctl-auto@.service1
-rw-r--r--services/netctl-ifplugd@.service1
-rwxr-xr-xsrc/lib/auto.action1
4 files changed, 6 insertions, 1 deletions
diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt
index 6c3c4a7..01b6256 100644
--- a/docs/netctl.profile.5.txt
+++ b/docs/netctl.profile.5.txt
@@ -222,6 +222,10 @@ of the `wireless' type:
selection, the matched network with the highest priority will be
selected. Defaults to ``0`'.
+'ExcludeAuto='::
+ Whether or not to exclude this profile from automatic profile
+ selection. Defaults to ``no`'.
+
'WPAGroup='::
Group that has the authority to configure *wpa_supplicant* via its
control interface. Defaults to ``wheel`'.
diff --git a/services/netctl-auto@.service b/services/netctl-auto@.service
index 9a035da..6894fda 100644
--- a/services/netctl-auto@.service
+++ b/services/netctl-auto@.service
@@ -1,6 +1,7 @@
[Unit]
Description=Automatic wireless network connection using netctl profiles
Documentation=man:netctl.special(7)
+BindsTo=sys-subsystem-net-devices-%i.device
Before=network.target
Wants=network.target
diff --git a/services/netctl-ifplugd@.service b/services/netctl-ifplugd@.service
index 05cb1cf..3f48362 100644
--- a/services/netctl-ifplugd@.service
+++ b/services/netctl-ifplugd@.service
@@ -1,6 +1,7 @@
[Unit]
Description=Automatic wired network connection using netctl profiles
Documentation=man:netctl.special(7)
+BindsTo=sys-subsystem-net-devices-%i.device
[Service]
ExecStart=/usr/bin/ifplugd -i %i -r /etc/ifplugd/netctl.action -fIns
diff --git a/src/lib/auto.action b/src/lib/auto.action
index bfb5f1d..bdbb9ad 100755
--- a/src/lib/auto.action
+++ b/src/lib/auto.action
@@ -12,7 +12,6 @@ PROFILE_FILE="$STATE_DIR/wpa_actiond_$interface.profile"
# Is it possible that we don't get a profile?!
[[ "$profile" ]] && load_profile "$profile"
-# TODO: copy some from 'network'
case $action in
CONNECT)
if [[ -z $profile ]]; then