[arch-projects] [netctl][PATCH 2/3] Move from /usr/lib/network to /usr/lib/netctl
Jouke Witteveen
j.witteveen at gmail.com
Fri Mar 3 18:24:27 UTC 2017
---
Makefile | 10 +++++-----
services/netctl-wait-online.service | 2 +-
services/netctl at .service | 4 ++--
src/ifplugd.action | 2 +-
src/lib/auto.action | 2 +-
src/lib/connections/README | 8 ++++----
src/lib/dhcp/README | 8 ++++----
src/lib/globals | 4 ++--
src/lib/ip | 2 +-
src/lib/network | 2 +-
src/lib/rfkill | 2 +-
src/lib/wpa | 2 +-
src/netctl-auto | 2 +-
src/netctl.in | 2 +-
src/wifi-menu | 2 +-
15 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Makefile b/Makefile
index 157ecfd..e9f7fa8 100644
--- a/Makefile
+++ b/Makefile
@@ -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" \
diff --git a/services/netctl-wait-online.service b/services/netctl-wait-online.service
index 64ca06d..86329aa 100644
--- a/services/netctl-wait-online.service
+++ b/services/netctl-wait-online.service
@@ -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
diff --git a/services/netctl at .service b/services/netctl at .service
index 3bb4129..77415d8 100644
--- a/services/netctl at .service
+++ b/services/netctl at .service
@@ -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
diff --git a/src/ifplugd.action b/src/ifplugd.action
index a1c8dee..fa0321e 100755
--- a/src/ifplugd.action
+++ b/src/ifplugd.action
@@ -2,7 +2,7 @@
#
# ifplugd.action script for netctl
-. /usr/lib/network/globals
+. /usr/lib/netctl/globals
PROFILE_FILE="$STATE_DIR/ifplugd-$1.profile"
diff --git a/src/lib/auto.action b/src/lib/auto.action
index 5b770c2..66d13b0 100755
--- a/src/lib/auto.action
+++ b/src/lib/auto.action
@@ -1,6 +1,6 @@
#! /bin/bash
-. /usr/lib/network/globals
+. /usr/lib/netctl/globals
. "$SUBR_DIR/ip"
export INTERFACE="$1"
diff --git a/src/lib/connections/README b/src/lib/connections/README
index 2dd4b7b..10282fe 100644
--- a/src/lib/connections/README
+++ b/src/lib/connections/README
@@ -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
diff --git a/src/lib/dhcp/README b/src/lib/dhcp/README
index df17d5a..87a0669 100644
--- a/src/lib/dhcp/README
+++ b/src/lib/dhcp/README
@@ -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
diff --git a/src/lib/globals b/src/lib/globals
index f4e64a3..ac3ae66 100644
--- a/src/lib/globals
+++ b/src/lib/globals
@@ -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}"
diff --git a/src/lib/ip b/src/lib/ip
index 71c7fa2..47253e4 100644
--- a/src/lib/ip
+++ b/src/lib/ip
@@ -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
diff --git a/src/lib/network b/src/lib/network
index 81a4234..e068bc8 100755
--- a/src/lib/network
+++ b/src/lib/network
@@ -1,6 +1,6 @@
#! /bin/bash
-. /usr/lib/network/globals
+. /usr/lib/netctl/globals
## Check if a string represents a network interface
diff --git a/src/lib/rfkill b/src/lib/rfkill
index 05c1382..959ff28 100644
--- a/src/lib/rfkill
+++ b/src/lib/rfkill
@@ -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
diff --git a/src/lib/wpa b/src/lib/wpa
index e7d873d..b696229 100644
--- a/src/lib/wpa
+++ b/src/lib/wpa
@@ -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
diff --git a/src/netctl-auto b/src/netctl-auto
index f78efe3..ff017b0 100755
--- a/src/netctl-auto
+++ b/src/netctl-auto
@@ -1,7 +1,7 @@
#! /bin/bash
# Contributed by: Sebastian Wicki <gandro at gmx.net>
-. /usr/lib/network/globals
+. /usr/lib/netctl/globals
. "$SUBR_DIR/wpa"
. "$SUBR_DIR/rfkill"
diff --git a/src/netctl.in b/src/netctl.in
index 37c095c..f5c5459 100644
--- a/src/netctl.in
+++ b/src/netctl.in
@@ -1,6 +1,6 @@
#! /bin/bash
-. /usr/lib/network/globals
+. /usr/lib/netctl/globals
usage() {
diff --git a/src/wifi-menu b/src/wifi-menu
index c13c35b..bafefc4 100755
--- a/src/wifi-menu
+++ b/src/wifi-menu
@@ -1,6 +1,6 @@
#! /bin/bash
-. /usr/lib/network/globals
+. /usr/lib/netctl/globals
. "$SUBR_DIR/wpa"
. "$SUBR_DIR/rfkill"
--
2.12.0
More information about the arch-projects
mailing list