@@ -15,11 +15,11 @@ install:
install -d $(DESTDIR)/etc/netctl/{examples,hooks,interfaces}
install -m644 docs/examples/* $(DESTDIR)/etc/netctl/examples/
# Libs
- install -d $(DESTDIR)/usr/lib/network/{connections,dhcp}
- install -m644 src/lib/{globals,ip,rfkill,wpa} $(DESTDIR)/usr/lib/network/
- install -m644 src/lib/connections/* $(DESTDIR)/usr/lib/network/connections/
- install -m644 src/lib/dhcp/* $(DESTDIR)/usr/lib/network/dhcp/
- install -m755 src/lib/{auto.action,network} $(DESTDIR)/usr/lib/network/
+ install -d $(DESTDIR)/usr/lib/netctl/{connections,dhcp}
+ install -m644 src/lib/{globals,ip,rfkill,wpa} $(DESTDIR)/usr/lib/netctl/
+ install -m644 src/lib/connections/* $(DESTDIR)/usr/lib/netctl/connections/
+ install -m644 src/lib/dhcp/* $(DESTDIR)/usr/lib/netctl/dhcp/
+ install -m755 src/lib/{auto.action,network} $(DESTDIR)/usr/lib/netctl/
# Scripts
install -d $(DESTDIR)/usr/bin
sed -e "s|@systemdsystemconfdir@|$(systemdsystemconfdir)|g" \
@@ -7,7 +7,7 @@ Before=network-online.target
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/usr/lib/network/network wait-online
+ExecStart=/usr/lib/netctl/network wait-online
[Install]
WantedBy=network-online.target
@@ -9,5 +9,5 @@ Wants=network.target
Type=notify
NotifyAccess=exec
RemainAfterExit=yes
-ExecStart=/usr/lib/network/network start %I
-ExecStop=/usr/lib/network/network stop %I
+ExecStart=/usr/lib/netctl/network start %I
+ExecStop=/usr/lib/netctl/network stop %I
@@ -2,7 +2,7 @@
#
# ifplugd.action script for netctl
-. /usr/lib/network/globals
+. /usr/lib/netctl/globals
PROFILE_FILE="$STATE_DIR/ifplugd-$1.profile"
@@ -1,6 +1,6 @@
#! /bin/bash
-. /usr/lib/network/globals
+. /usr/lib/netctl/globals
. "$SUBR_DIR/ip"
export INTERFACE="$1"
@@ -1,11 +1,11 @@
Support for connection types is implemented by connection files in
- /usr/lib/network/connections/
+ /usr/lib/netctl/connections/
The file name determines the name of the connection type, so support
for the aviancarrier connection type will be provided by the file:
- /usr/lib/network/connections/aviancarrier
+ /usr/lib/netctl/connections/aviancarrier
Files that implement support for a connection type should NOT be
executable. Such files should contain valid Bash code, among which two
@@ -20,8 +20,8 @@ respectively. When the functions are called, three bash files are
already sourced, so all functions and variables in those files are
available. The readily sourced files are:
- /usr/lib/network/network
- /usr/lib/network/globals
+ /usr/lib/netctl/network
+ /usr/lib/netctl/globals
/etc/netctl/<profile>
Here, <profile> is the profile file specifying the desired network
@@ -1,11 +1,11 @@
Support for dhcp clients is implemented by files in
- /usr/lib/network/dhcp/
+ /usr/lib/netctl/dhcp/
The file name determines the name of the client for the profile, so
support for a client named dhcpcd is provided by the file:
- /usr/lib/network/dhcp/dhcpcd
+ /usr/lib/netctl/dhcp/dhcpcd
Files that implement support for a connection type should NOT be
executable. Such files should contain valid Bash code, among which two
@@ -20,8 +20,8 @@ client. When the functions are called, three bash files are already
sourced, so all functions and variables in those files are available.
The readily sourced files are:
- /usr/lib/network/network
- /usr/lib/network/globals
+ /usr/lib/netctl/network
+ /usr/lib/netctl/globals
/etc/netctl/<profile>
Here, <profile> is the profile file specifying the desired network
@@ -1,7 +1,7 @@
NETCTL_VERSION="notpackaged"
PROFILE_DIR="/etc/netctl"
-SUBR_DIR="/usr/lib/network"
-STATE_DIR="/run/network"
+SUBR_DIR="/usr/lib/netctl"
+STATE_DIR="/run/netctl"
STATE_FILE="${NETCTL_STATE_FILE:-/var/lib/netctl/netctl.state}"
@@ -1,4 +1,4 @@
-## /usr/lib/network/globals needs to be sourced before this file
+## /usr/lib/netctl/globals needs to be sourced before this file
## Interface a DHCP client
@@ -1,6 +1,6 @@
#! /bin/bash
-. /usr/lib/network/globals
+. /usr/lib/netctl/globals
## Check if a string represents a network interface
@@ -1,4 +1,4 @@
-## /usr/lib/network/globals needs to be sourced before this file
+## /usr/lib/netctl/globals needs to be sourced before this file
## Determine the system interface of an rfkill device
@@ -1,4 +1,4 @@
-## /usr/lib/network/globals needs to be sourced before this file
+## /usr/lib/netctl/globals needs to be sourced before this file
## Wrapper around wpa_cli to deal with supplicant configurations that set a
@@ -1,7 +1,7 @@
#! /bin/bash
# Contributed by: Sebastian Wicki <gandro@gmx.net>
-. /usr/lib/network/globals
+. /usr/lib/netctl/globals
. "$SUBR_DIR/wpa"
. "$SUBR_DIR/rfkill"
@@ -1,6 +1,6 @@
#! /bin/bash
-. /usr/lib/network/globals
+. /usr/lib/netctl/globals
usage() {
@@ -1,6 +1,6 @@
#! /bin/bash
-. /usr/lib/network/globals
+. /usr/lib/netctl/globals
. "$SUBR_DIR/wpa"
. "$SUBR_DIR/rfkill"