Commit 99bac267 authored by Jouke Witteveen's avatar Jouke Witteveen
Browse files

Move from /usr/lib/network to /usr/lib/netctl

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