summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2012-12-28 02:43:13 +0100
committerJouke Witteveen <j.witteveen@gmail.com>2012-12-28 02:57:35 +0100
commit27c11787d7c58b02f12d7afd476ea66abfeecaaf (patch)
treee203812a9e6d2a901568ca36de3b1fc7380a369b /services
parent4e457e0efd0e5fd5df24c7e9ed63b02d0196ea8d (diff)
downloadnetctl-27c11787d7c58b02f12d7afd476ea66abfeecaaf.tar.gz
netctl-27c11787d7c58b02f12d7afd476ea66abfeecaaf.tar.xz
Forking netcfg to netctl (2/2)
This commit contains the refactoring and rewriting of code.
Diffstat (limited to 'services')
-rw-r--r--services/netctl-auto@.service8
-rw-r--r--services/netctl-ifplugd@.service7
-rw-r--r--services/netctl.service7
-rw-r--r--services/netctl@.service9
4 files changed, 15 insertions, 16 deletions
diff --git a/services/netctl-auto@.service b/services/netctl-auto@.service
index 81f2369..9a035da 100644
--- a/services/netctl-auto@.service
+++ b/services/netctl-auto@.service
@@ -1,12 +1,12 @@
[Unit]
-Description=Automatic wireless network connection via netcfg
+Description=Automatic wireless network connection using netctl profiles
+Documentation=man:netctl.special(7)
Before=network.target
Wants=network.target
[Service]
-EnvironmentFile=/etc/conf.d/netcfg
-ExecStart=/usr/bin/netcfg-wpa_actiond $WIRELESS_INTERFACE
-ExecStop=/usr/bin/netcfg-wpa_actiond stop $WIRELESS_INTERFACE
+ExecStart=/usr/bin/netctl-auto start %i
+ExecStop=/usr/bin/netctl-auto stop %i
RemainAfterExit=yes
Type=forking
diff --git a/services/netctl-ifplugd@.service b/services/netctl-ifplugd@.service
index 8948ac6..05cb1cf 100644
--- a/services/netctl-ifplugd@.service
+++ b/services/netctl-ifplugd@.service
@@ -1,10 +1,9 @@
[Unit]
-Description=Automatic wired network connection via netcfg
+Description=Automatic wired network connection using netctl profiles
+Documentation=man:netctl.special(7)
[Service]
-EnvironmentFile=/etc/conf.d/netcfg
-ExecStart=/usr/bin/ifplugd -i $WIRED_INTERFACE -r /etc/ifplugd/netcfg.action -fIns
-ExecStop=/usr/bin/netcfg iface-down $WIRED_INTERFACE
+ExecStart=/usr/bin/ifplugd -i %i -r /etc/ifplugd/netctl.action -fIns
[Install]
WantedBy=multi-user.target
diff --git a/services/netctl.service b/services/netctl.service
index f400be0..593d36f 100644
--- a/services/netctl.service
+++ b/services/netctl.service
@@ -1,13 +1,12 @@
[Unit]
-Description=Netcfg multi-profile daemon
+Description=(Re)store the netctl profile state
Before=network.target
-Wants=network.target
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/usr/bin/netcfg-daemon start
-ExecStop=/usr/bin/netcfg-daemon stop
+ExecStart=-/usr/bin/netctl restore
+ExecStop=/usr/bin/netctl store
KillMode=none
[Install]
diff --git a/services/netctl@.service b/services/netctl@.service
index 57229f8..9bd99b6 100644
--- a/services/netctl@.service
+++ b/services/netctl@.service
@@ -1,13 +1,14 @@
[Unit]
-Description=Netcfg networking service for profile %i
-Before=network.target
+Description=Networking for netctl profile %i
+Documentation=man:netctl.profile(5)
+Before=network.target netctl.service
Wants=network.target
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/usr/bin/netcfg check-iface %i
-ExecStop=-/usr/bin/netcfg down %i
+ExecStart=/usr/lib/network/network start %i
+ExecStop=/usr/lib/network/network stop %i
KillMode=none
[Install]