March 2017 - Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio][PATCH] init: introduce a non-interactive mode (rd.noninteractive)
by Martin Peres 10 Mar '17

10 Mar '17

CI systems compile and boot on kernels that are sometimes broken and fail to find the root device. This patch adds a new parameter (rd.noninteractive) that prevents starting an interactive shell and reboots the machine 2 seconds after warning the user about the issue. This allows me to test the kernel faster than would be possible using external watchdogs which would require at least 2 minutes before kicking in. --- init_functions | 16 ++++++++++++++++ man/mkinitcpio.8.txt | 3 +++ test/test_parse_cmdline | 2 ++ 3 files changed, 21 insertions(+) diff --git a/init_functions b/init_functions index d5a584e..7287086 100644 --- a/init_functions +++ b/init_functions @@ -47,6 +47,19 @@ poll_device() { } launch_interactive_shell() { + if [ -n "$rd_noninteractive" ]; then + printf '%s\n' \ + "************** REBOOT REQUIRED **************" \ + "* *" \ + "* running in non-interactive mode *" \ + "* - *" \ + "* automatically restarting in 2 seconds *" \ + "* *" \ + "*********************************************" + sleep 2 + reboot -f + fi + export PS1='[rootfs \W]\$ ' # explicitly redirect to /dev/console in case we're logging. note that @@ -174,6 +187,9 @@ parse_cmdline_item() { rd_logmask=$(( _rdlog_kmsg | _rdlog_cons )) fi ;; + rd.noninteractive) + rd_noninteractive=y + ;; [![:alpha:]_]*|[[:alpha:]_]*[![:alnum:]_]*) # invalid shell variable, ignore it ;; diff --git a/man/mkinitcpio.8.txt b/man/mkinitcpio.8.txt index 5c3118e..d9410dc 100644 --- a/man/mkinitcpio.8.txt +++ b/man/mkinitcpio.8.txt @@ -292,6 +292,9 @@ the kernel command line: *all*;; Writes output to all known log targets. +*rd.noninteractive*:: + If specified, reboot the machine instead of starting an interactive shell. + These are only the variables that the core of mkinitcpio honor. Additional hooks may look for other environment variables and should be documented by the help output for the hook. diff --git a/test/test_parse_cmdline b/test/test_parse_cmdline index ff855e4..9249962 100755 --- a/test/test_parse_cmdline +++ b/test/test_parse_cmdline @@ -217,6 +217,8 @@ test_parse 'rd.log=kmsg' \ 'rd_logmask' '2' test_parse 'rd.log=file' \ 'rd_logmask' '1' +test_parse 'rd.noninteractive' \ + 'rd_noninteractive' 'y' # a mix of stuff test_parse 'foo=bar bareword bar="ba az"' \ -- 2.11.1

1 1

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. v22-2-g70511e5
by dreisner＠archlinux.org 10 Mar '17

10 Mar '17

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official mkinitcpio repository". The branch, master has been updated via 70511e5ccb7e2500213e04173a70c067a7c9aa35 (commit) via 5249350c80a6158ebcf278e780f42c6abc3643f1 (commit) via 30888208bf7b1b2bce3f0b132393b6a3bb303657 (commit) from bf389393ffa56881688fbff1219c562ec2997d98 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 70511e5ccb7e2500213e04173a70c067a7c9aa35 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Mar 10 07:12:42 2017 -0500 init: move early mounting to function, add efivars ref: https://bugs.archlinux.org/task/52768 commit 5249350c80a6158ebcf278e780f42c6abc3643f1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Nov 28 17:47:14 2016 -0500 functions: attempt to (re)add builtin modules crc32 is a builtin module in the Arch kernel but also a crypto module. Resolve by this only noting that a module is added if the value in the has is 1, and not 2 (indicating a builtin). While we're here, change the f2fs softdep of crc32 to crypto-crc32. ref: https://bugs.archlinux.org/task/49380 commit 30888208bf7b1b2bce3f0b132393b6a3bb303657 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 27 14:06:51 2016 -0500 Makefile: assorted cleanups and additions ----------------------------------------------------------------------- Summary of changes: Makefile | 31 +++++++++++++++++++++---------- functions | 4 ++-- init | 6 +----- init_functions | 12 ++++++++++++ 4 files changed, 36 insertions(+), 17 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch heftig created. 20170304-6-geec7fcf
by heftig＠archlinux.org 07 Mar '17

07 Mar '17

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, heftig has been created at eec7fcf965763d5395c336f92cd56b193d054947 (commit) - Log ----------------------------------------------------------------- commit eec7fcf965763d5395c336f92cd56b193d054947 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Tue Mar 7 20:14:50 2017 +0100 archbuild/makechrootpkg: Delete subvolumes in roots The systemd package creates a subvolume at /var/lib/machines (through tmpfiles), if it can. We need to delete this subvolume before we can delete the parent subvolume. Look through the root for inodes with the number 256. These identify subvolume roots. commit c53a3e80170dc9d45beeeb623edfbf0bd40799a7 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Tue Mar 7 19:55:05 2017 +0100 lib/archroot.sh: Add is_btrfs helper commit 45f87aa9d5b44e4ff2f73be6597d4024bcded8e3 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Tue Mar 7 19:27:36 2017 +0100 lib/archroot.sh: Simplify check_root Move the function and save the orig_argv right along it. commit 66553e7e07af9261e55c7c287615b61dc080593d Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Tue Mar 7 19:19:29 2017 +0100 lib/archroot.sh: Move CHROOT_VERSION to a common file commit cda9cf436b2897b063c1e40efb144404aad8b821 Author: Alad Wenter <alad(a)archlinux.info> Date: Fri Jul 22 15:37:25 2016 +0200 makechrootpkg: run makepkg as specified user makepkg --asroot was removed with pacman 4.2. Allow to specify a separate makepkg user from the command line instead. Fixes FS#43432 commit 06c98c1b54f0aea812caca3708b320a2dd566108 Author: Alad Wenter <alad(a)archlinux.info> Date: Fri Jul 22 15:37:24 2016 +0200 makechrootpkg: explain load_vars The way in which makechrootpkg reads variables from makepkg.conf(5) is different from makepkg, in that it reads a subset of defined variables, and only if the were not set in the environment before. Mention this in the usage text. Fixes FS#44827 ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20170304
by heftig＠archlinux.org 04 Mar '17

04 Mar '17

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via e10ce7fc70fe0440a888b656ed8d92e7657e4f7b (commit) from ff48401963c73a299373a61bca14b60519e4e3c1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e10ce7fc70fe0440a888b656ed8d92e7657e4f7b Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Sat Mar 4 15:10:11 2017 +0100 Version 20170304 ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20170304 created. 20170304
by heftig＠archlinux.org 04 Mar '17

04 Mar '17

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The annotated tag, 20170304 has been created at 14436ad274b3e01f21e23eaf9e2c0819f1be7fae (tag) tagging e10ce7fc70fe0440a888b656ed8d92e7657e4f7b (commit) replaces 20160528 tagged by Jan Alexander Steffens (heftig) on Sat Mar 4 15:10:18 2017 +0100 - Log ----------------------------------------------------------------- Version 20170304 -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEghj4iEmqxSLpTPRwpekojE+kFfoFAli6ysoACgkQpekojE+k FfqvFAf+PdSEgJufyHFm0zVYwBuv7JU3lI3AOhBVgAnG62utK9Q1C+2PUnRxOC7f LA6HuQwhn7jnr7C2CHZI8XllitIcOpZ1p76avIFeTuJovNxtE5lyyiY8kN9DSqle nRd9k+Yb09Ce6D9qt0plcUPisp9DRn5Nb9D9XyHE6WpAELUgOrOOAd7BXmTquwj3 0xEDe/z8rX/VNgSPbms5CVMXjh3sBQdnbA3BD6NHAmE1S9eMhZ+fUb5OC9hXInr+ EZKz1wJkGGKbbQ8DW2S0m9UFLUiJ20JQIwshgfr406B4d5E8yQ0ZP2LOfYoMw8wQ 6/yEsHvXVghtU6Mt+O5gRIlqscrcVg== =8dbt -----END PGP SIGNATURE----- Jan Alexander Steffens (heftig) (5): makechrootpkg: Shorten user-config loading code makechrootpkg: Reset environment for builduser mkarchroot: Set LANG=en_US.UTF-8 makechrootpkg: Simplify symlink replacement Version 20170304 Jelle van der Waa (2): lib: remove unused left, right lib: remove unused version, pkgparts Johannes Löthberg (1): makechrootpkg: Use XDG_CONFIG_HOME for makepkg.conf Levente Polyak (1): makechrootpkg: fix potential non-writable directories of builduser in /build NicoHood (1): makechrootpkg: Fix broken symlink because of temporary chroot PKGDEST /pkgdest ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20160528-9-gff48401
by heftig＠archlinux.org 04 Mar '17

04 Mar '17

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The branch, master has been updated via ff48401963c73a299373a61bca14b60519e4e3c1 (commit) via 15f16162fb960e496c971b2be45b5155e0f4427b (commit) via fea14fa28621a06e78d5c0c360efefa7097d6fbb (commit) via 4bafd641ab4e18083a1bac829c0e914523351259 (commit) via 58968cfaa239c2c4658b86a0fa81cfa1cd33f9cb (commit) via c8147a3512fbd7e721940a47e3d2b125078d1ad8 (commit) from 76dec8507e2e767db07f967644ed8958f85cd5a2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ff48401963c73a299373a61bca14b60519e4e3c1 Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Wed Feb 22 13:16:03 2017 +0100 makechrootpkg: fix potential non-writable directories of builduser in /build This removes the preservation of HOME being /build just for the pacman sudo call. Former leads to unbuildable packages when an to be installed dependency writes something into the HOME dir (f.e. .config). The resulting directories won't be writable by the builduser as they are owned by root:root and ultimately will fail to build anything that requires so. commit 15f16162fb960e496c971b2be45b5155e0f4427b Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Fri Jan 6 17:20:16 2017 +0100 lib: remove unused version, pkgparts commit fea14fa28621a06e78d5c0c360efefa7097d6fbb Author: Jelle van der Waa <jelle(a)vdwaa.nl> Date: Fri Jan 6 17:19:12 2017 +0100 lib: remove unused left, right commit 4bafd641ab4e18083a1bac829c0e914523351259 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Sat Mar 4 15:00:50 2017 +0100 makechrootpkg: Simplify symlink replacement commit 58968cfaa239c2c4658b86a0fa81cfa1cd33f9cb Author: NicoHood <git(a)nicohood.de> Date: Sat Jan 7 14:50:27 2017 +0100 makechrootpkg: Fix broken symlink because of temporary chroot PKGDEST /pkgdest commit c8147a3512fbd7e721940a47e3d2b125078d1ad8 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Fri Feb 17 19:40:04 2017 +0100 mkarchroot: Set LANG=en_US.UTF-8 In order to have an UTF-8 locale in the build root. This is something normally set on real machines but is not set from our chroots. Meson, for example, loudly complains when the locale charset is not UTF-8. I'd like to have C.UTF-8, as most other distributions do. Unfortunately, it's not part of vanilla glibc; en_US.UTF-8 will have to do. mkarchroot already creates roots with both en_US.UTF-8 and de_DE.UTF-8, the latter because builds of gcc (perhaps used to) require it. Bump the CHROOT_VERSION due to the setting change. ----------------------------------------------------------------------- Summary of changes: arch-nspawn.in | 2 +- lib/common.sh | 4 +--- makechrootpkg.in | 6 +++++- mkarchroot.in | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [PATCH] Fix broken symlink because of temporary chroot PKGDEST /pkgdest
by archlinux＠nicohood.de 04 Mar '17

04 Mar '17

From: NicoHood <git(a)nicohood.de> --- makechrootpkg.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/makechrootpkg.in b/makechrootpkg.in index 284d444..766f237 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -233,6 +233,12 @@ move_products() { for pkgfile in "$copydir"/pkgdest/*; do chown "$src_owner" "$pkgfile" mv "$pkgfile" "$PKGDEST" + + # Fix broken symlink because of temporary chroot PKGDEST /pkgdest + if [[ "$PWD" != "$PKGDEST" && -L "$PWD/${pkgfile##*/}" ]]; then + rm "$PWD/${pkgfile##*/}" + ln -s "$PKGDEST/${pkgfile##*/}" "$PWD/${pkgfile##*/}" + fi done for l in "$copydir"/logdest/*; do -- 2.11.0

3 3

[arch-projects] [netctl][PATCH 3/3] Factor out network interface utilities
by Jouke Witteveen 03 Mar '17

03 Mar '17

--- Makefile | 2 +- src/lib/auto.action | 2 ++ src/lib/connections/README | 1 + src/lib/dhcp/README | 1 + src/lib/globals | 5 +--- src/lib/interface | 65 ++++++++++++++++++++++++++++++++++++++++++++++ src/lib/network | 55 ++------------------------------------- src/netctl-auto | 17 +++++------- src/wifi-menu | 12 ++++----- 9 files changed, 85 insertions(+), 75 deletions(-) create mode 100644 src/lib/interface diff --git a/Makefile b/Makefile index e9f7fa8..34d3956 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ install: install -m644 docs/examples/* $(DESTDIR)/etc/netctl/examples/ # Libs install -d $(DESTDIR)/usr/lib/netctl/{connections,dhcp} - install -m644 src/lib/{globals,ip,rfkill,wpa} $(DESTDIR)/usr/lib/netctl/ + install -m644 src/lib/{globals,interface,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/ diff --git a/src/lib/auto.action b/src/lib/auto.action index 66d13b0..31e089f 100755 --- a/src/lib/auto.action +++ b/src/lib/auto.action @@ -1,6 +1,7 @@ #! /bin/bash . /usr/lib/netctl/globals +. "$SUBR_DIR/interface" . "$SUBR_DIR/ip" export INTERFACE="$1" @@ -10,6 +11,7 @@ Profile="$3" export ACTION="$4" load_profile "$Profile" +load_interface_config "$INTERFACE" case $ACTION in CONNECT) diff --git a/src/lib/connections/README b/src/lib/connections/README index 10282fe..eb2c29f 100644 --- a/src/lib/connections/README +++ b/src/lib/connections/README @@ -22,6 +22,7 @@ available. The readily sourced files are: /usr/lib/netctl/network /usr/lib/netctl/globals + /usr/lib/netctl/interface /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 87a0669..e231b46 100644 --- a/src/lib/dhcp/README +++ b/src/lib/dhcp/README @@ -22,6 +22,7 @@ The readily sourced files are: /usr/lib/netctl/network /usr/lib/netctl/globals + /usr/lib/netctl/interface /etc/netctl/<profile> Here, <profile> is the profile file specifying the desired network diff --git a/src/lib/globals b/src/lib/globals index ac3ae66..3caae2f 100644 --- a/src/lib/globals +++ b/src/lib/globals @@ -109,7 +109,7 @@ list_profiles() { find -L "$PROFILE_DIR/" -maxdepth 1 -type f -not -name '.*' -not -name '*~' -not -name $'*\n*' -not -name '*.action' -not -name '*.conf' -not -name '*.service' -printf "%f\n" } -## Sources all hooks, a profile and any interface hook +## Sources all hooks and a profile (but no interface configuration) # $1: profile name load_profile() { local hook @@ -126,9 +126,6 @@ load_profile() { if [[ ! -r "${Connection:+$SUBR_DIR/connections/$Connection}" ]]; then exit_error "Profile '$1' does not specify a valid connection" fi - if [[ -x "$PROFILE_DIR/interfaces/$Interface" ]]; then - source "$PROFILE_DIR/interfaces/$Interface" - fi source "$SUBR_DIR/connections/$Connection" } diff --git a/src/lib/interface b/src/lib/interface new file mode 100644 index 0000000..2ebf81e --- /dev/null +++ b/src/lib/interface @@ -0,0 +1,65 @@ +## /usr/lib/netctl/globals needs to be sourced before this file + + +## Load interface configuration, if present +# $1: interface name +load_interface_config() { + local config_file="$PROFILE_DIR/interfaces/$1" + if [[ -x $config_file ]]; then + source "$config_file" + fi +} + +## Check if a string represents a network interface +# $1: potential interface name +is_interface() { + # Strip any old school alias specifier + [[ -d "/sys/class/net/${1%%:?*}" ]] +} + +## Add an interface +# $1: interface type +# $2: interface name +# $3: interface link (optional) +# $4...: additional arguments +interface_add() { + local type="$1" name="$2" link="$3" + do_debug ip link add ${link:+link "$link"} name "$name" type "$type" "${@:4}" $LinkOptions || return + load_interface_config "$name" +} + +## Delete an interface +# $1: interface name +interface_delete() { + bring_interface_down "$1" + ip link delete "$1" +} + +## Check if an interface is up +# $1: interface name +interface_is_up() { + local flags + read flags < "/sys/class/net/${1%%:?*}/flags" + # IFF_UP is defined as 0x1 in linux/if.h + (( flags & 0x1 )) +} + +## Activate an interface +# $1: interface name +bring_interface_up() { + local interface=$1 + ip link set dev "$interface" up &>/dev/null + timeout_wait "${TimeoutUp:-5}" 'interface_is_up "$interface"' +} + +## Deactivate an interface +# $1: interface name +bring_interface_down() { + local interface=$1 + ip link set dev "$interface" down &>/dev/null + # We reuse the up timeout (down normally is faster) + timeout_wait "${TimeoutUp:-5}" '! interface_is_up "$interface"' +} + + +# vim: ft=sh ts=4 et sw=4: diff --git a/src/lib/network b/src/lib/network index e068bc8..9c88c9c 100755 --- a/src/lib/network +++ b/src/lib/network @@ -1,61 +1,9 @@ #! /bin/bash . /usr/lib/netctl/globals +. "$SUBR_DIR/interface" -## Check if a string represents a network interface -# $1: potential interface name -is_interface() { - # Strip any old school alias specifier - [[ -d "/sys/class/net/${1%%:?*}" ]] -} - -## Add an interface -# $1: interface type -# $2: interface name -# $3: interface link (optional) -# $4...: additional arguments -interface_add() { - local type="$1" name="$2" link="$3" - do_debug ip link add ${link:+link "$link"} name "$name" type "$type" "${@:4}" $LinkOptions || return - if [[ -x "$PROFILE_DIR/interfaces/$name" ]]; then - source "$PROFILE_DIR/interfaces/$name" - fi -} - -## Delete an interface -# $1: interface name -interface_delete() { - bring_interface_down "$1" - ip link delete "$1" -} - -## Check if an interface is up -# $1: interface name -interface_is_up() { - local flags - read flags < "/sys/class/net/${1%%:?*}/flags" - # IFF_UP is defined as 0x1 in linux/if.h - (( flags & 0x1 )) -} - -## Activate an interface -# $1: interface name -bring_interface_up() { - local interface=$1 - ip link set dev "$interface" up &>/dev/null - timeout_wait "${TimeoutUp:-5}" 'interface_is_up "$interface"' -} - -## Deactivate an interface -# $1: interface name -bring_interface_down() { - local interface=$1 - ip link set dev "$interface" down &>/dev/null - # We reuse the up timeout (down normally is faster) - timeout_wait "${TimeoutUp:-5}" '! interface_is_up "$interface"' -} - ## Indicate that the network stack for the profile is up network_ready() { if ! is_yes "${WaitOnline:-no}" && ! is_yes "${NETWORK_READY:-no}"; then @@ -82,6 +30,7 @@ if [[ $# -eq 2 && $1 == @(start|stop) ]]; then # Expose the profile name Profile=$2 load_profile "$Profile" + load_interface_config "$Interface" elif [[ $# -ne 1 || $1 != "wait-online" ]]; then exit_error "Usage: $0 {start|stop|wait-online} [profile]" fi diff --git a/src/netctl-auto b/src/netctl-auto index ff017b0..f49273b 100755 --- a/src/netctl-auto +++ b/src/netctl-auto @@ -2,8 +2,9 @@ # Contributed by: Sebastian Wicki <gandro(a)gmx.net> . /usr/lib/netctl/globals -. "$SUBR_DIR/wpa" +. "$SUBR_DIR/interface" . "$SUBR_DIR/rfkill" +. "$SUBR_DIR/wpa" : ${ACTIOND:=wpa_actiond -p /run/wpa_supplicant} : ${ACTION_SCRIPT:=$SUBR_DIR/auto.action} @@ -200,11 +201,8 @@ start() { local interface="$1" local pidfile="$STATE_DIR/wpa_actiond-$interface.pid" - if wpa_is_active "$interface"; then - exit_error "The interface ($interface) is already in use" - fi - if [[ -x "$PROFILE_DIR/interfaces/$interface" ]]; then - source "$PROFILE_DIR/interfaces/$interface" + if interface_is_up "$interface"; then + exit_error "The interface '$interface' is already up" fi if [[ $RFKill ]]; then rf_enable "$interface" "$RFKill" || return 1 @@ -240,6 +238,7 @@ start() { return 0 fi wpa_stop "$interface" + bring_interface_down "$interface" fi return 1 } @@ -251,11 +250,8 @@ stop() { local pidfile="$STATE_DIR/wpa_actiond-$interface.pid" [[ -e "$pidfile" ]] && kill "$(< "$pidfile")" - if [[ -x "$PROFILE_DIR/interfaces/$interface" ]]; then - source "$PROFILE_DIR/interfaces/$interface" - fi timeout_wait 1 '! wpa_is_active "$interface"' || wpa_stop "$interface" - ip link set dev "$interface" down + bring_interface_down "$interface" [[ $RFKill ]] && rf_disable "$interface" "$RFKill" return 0 } @@ -286,6 +282,7 @@ case $# in exit_error "Use 'systemctl $1 netctl-auto@$2' to $1 netctl-auto." fi ensure_root "$(basename "$0")" + load_interface_config "$2" "$1" "$2";; *) exit_error "$(usage)";; diff --git a/src/wifi-menu b/src/wifi-menu index bafefc4..65fddd6 100755 --- a/src/wifi-menu +++ b/src/wifi-menu @@ -1,8 +1,9 @@ #! /bin/bash . /usr/lib/netctl/globals -. "$SUBR_DIR/wpa" +. "$SUBR_DIR/interface" . "$SUBR_DIR/rfkill" +. "$SUBR_DIR/wpa" usage() { @@ -231,15 +232,12 @@ if [[ -z "$INTERFACE" ]]; then fi INTERFACE=${INTERFACE:15:-10} report_debug "Using interface '$INTERFACE'" +elif ! is_interface "$INTERFACE"; then + exit_error "No such interface: $INTERFACE" fi -if [[ -x "$PROFILE_DIR/interfaces/$INTERFACE" ]]; then - source "$PROFILE_DIR/interfaces/$INTERFACE" -fi +load_interface_config "$INTERFACE" cd / # We do not want to spawn anything that can block unmounting -if [[ ! -d "/sys/class/net/$INTERFACE" ]]; then - exit_error "No such interface: $INTERFACE" -fi if [[ "$RFKill" && "$(rf_status "$INTERFACE" "$RFKill")" ]]; then if ! rf_enable "$INTERFACE" "$RFKill"; then exit_error "Could not unblock transmission on interface '$INTERFACE'" -- 2.12.0

1 0

[arch-projects] [netctl][PATCH 2/3] Move from /usr/lib/network to /usr/lib/netctl
by Jouke Witteveen 03 Mar '17

03 Mar '17

--- Makefile | 10 +++++----- services/netctl-wait-online.service | 2 +- services/netctl@.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@.service b/services/netctl@.service index 3bb4129..77415d8 100644 --- a/services/netctl@.service +++ b/services/netctl@.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(a)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

1 0

[arch-projects] [netctl][PATCH 1/3] Minor code streamlining
by Jouke Witteveen 03 Mar '17

03 Mar '17

--- src/ifplugd.action | 2 +- src/lib/connections/mobile_ppp | 4 ++-- src/lib/connections/pppoe | 4 ++-- src/lib/dhcp/dhclient | 4 ++-- src/lib/dhcp/dhcpcd | 4 ++-- src/lib/wpa | 25 +++++++++++++------------ src/netctl-auto | 9 ++++++--- src/netctl.in | 2 +- 8 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/ifplugd.action b/src/ifplugd.action index 42d1c5a..a1c8dee 100755 --- a/src/ifplugd.action +++ b/src/ifplugd.action @@ -4,7 +4,7 @@ . /usr/lib/network/globals -PROFILE_FILE="$STATE_DIR/ifplugd_$1.profile" +PROFILE_FILE="$STATE_DIR/ifplugd-$1.profile" case "$2" in up) diff --git a/src/lib/connections/mobile_ppp b/src/lib/connections/mobile_ppp index 0890373..11cb41e 100644 --- a/src/lib/connections/mobile_ppp +++ b/src/lib/connections/mobile_ppp @@ -11,7 +11,7 @@ quote_word() { } mobile_ppp_up() { - local options_dir="$STATE_DIR/mobile_ppp.$Interface.$Profile" + local options_dir="$STATE_DIR/mobile_ppp-$Interface-$Profile" network_ready @@ -83,7 +83,7 @@ EOF mobile_ppp_down() { local options_dir pidfile pid - options_dir="$STATE_DIR/mobile_ppp.$Interface.$Profile" + options_dir="$STATE_DIR/mobile_ppp-$Interface-$Profile" pidfile="/var/run/ppp-$Profile.pid" if [[ -r $pidfile ]]; then diff --git a/src/lib/connections/pppoe b/src/lib/connections/pppoe index 15e4db5..96cda80 100644 --- a/src/lib/connections/pppoe +++ b/src/lib/connections/pppoe @@ -8,7 +8,7 @@ quote_word() { } pppoe_up() { - local options="$STATE_DIR/pppoe.$Interface.$Profile/options" + local options="$STATE_DIR/pppoe-$Interface-$Profile/options" if ! is_interface "$Interface"; then report_error "Interface '$Interface' does not exist" @@ -61,7 +61,7 @@ EOF pppoe_down() { local options pidfile pid - options="$STATE_DIR/pppoe.$Interface.$Profile/options" + options="$STATE_DIR/pppoe-$Interface-$Profile/options" pidfile="/var/run/ppp-$Profile.pid" if [[ -r $pidfile ]]; then diff --git a/src/lib/dhcp/dhclient b/src/lib/dhcp/dhclient index 87e9a92..397adda 100644 --- a/src/lib/dhcp/dhclient +++ b/src/lib/dhcp/dhclient @@ -8,7 +8,7 @@ dhclient_start() { *) return 1;; esac [[ $2 == "noaddr" ]] && options+=" -S" - if ! do_debug do_readable dhclient -$1 -q -e "TIMEOUT=${TimeoutDHCP:-30}" -pf "$pidfile" $options "$Interface"; then + if ! do_debug do_readable dhclient "-$1" -q -e "TIMEOUT=${TimeoutDHCP:-30}" -pf "$pidfile" $options "$Interface"; then report_error "DHCP IPv$1 lease attempt failed on interface '$Interface'" return 1 fi @@ -18,7 +18,7 @@ dhclient_stop() { local stop="-x" pidfile="/run/dhclient-$Interface-$1.pid" if [[ -f $pidfile ]]; then is_yes "${DHCPReleaseOnStop:-no}" && stop="-r" - do_debug dhclient -$1 -q $stop "$Interface" -pf "$pidfile" > /dev/null + do_debug dhclient "-$1" -q $stop "$Interface" -pf "$pidfile" > /dev/null fi } diff --git a/src/lib/dhcp/dhcpcd b/src/lib/dhcp/dhcpcd index c88047f..ef1245d 100644 --- a/src/lib/dhcp/dhcpcd +++ b/src/lib/dhcp/dhcpcd @@ -13,7 +13,7 @@ dhcpcd_start() { fi # If using own dns, tell dhcpcd to NOT replace resolv.conf [[ $DNS ]] && options+=" -C resolv.conf" - if ! do_debug do_readable dhcpcd -$1 -q -t "${TimeoutDHCP:-30}" $options "$Interface"; then + if ! do_debug do_readable dhcpcd "-$1" -q -t "${TimeoutDHCP:-30}" $options "$Interface"; then report_error "DHCP IPv$1 lease attempt failed on interface '$Interface'" return 1 fi @@ -23,7 +23,7 @@ dhcpcd_stop() { local stop="-x" if [[ -f "/run/dhcpcd-$Interface-$1.pid" ]]; then is_yes "${DHCPReleaseOnStop:-no}" && stop="-k" - do_debug dhcpcd -$1 -q $stop "$Interface" > /dev/null + do_debug dhcpcd "-$1" -q $stop "$Interface" > /dev/null fi } diff --git a/src/lib/wpa b/src/lib/wpa index b61f93b..e7d873d 100644 --- a/src/lib/wpa +++ b/src/lib/wpa @@ -64,29 +64,29 @@ wpa_wait_while_state() { # $2: interface driver(s) # $3: configuration file wpa_start() { - local interface=$1 driver=$2 configuration=$3 - local pidfile="/run/wpa_supplicant_$interface.pid" + local interface=$1 driver=$2 config_file=$3 + local pidfile="/run/wpa_supplicant-$interface.pid" if ! type wpa_supplicant &> /dev/null; then report_error "You need to install 'wpa_supplicant'" return 127 fi - if [[ $configuration ]]; then - configuration="-c$configuration" + if [[ $config_file ]]; then + config_file="-c$config_file" else WPA_CTRL_DIR="/run/wpa_supplicant" - configuration="-C$WPA_CTRL_DIR" + config_file="-C$WPA_CTRL_DIR" fi do_debug wpa_supplicant -q -B -P "$pidfile" -i "$interface" -D "$driver" \ - "$configuration" $WPAOptions >&2 + "$config_file" $WPAOptions >&2 # Wait up to one second for the pid file to appear if ! timeout_wait 1 '[[ -f $pidfile ]]'; then # Remove the configuration file if it was generated - configuration="$STATE_DIR/wpa_supplicant_$interface.conf" - [[ -f $configuration && -O $configuration ]] && rm -f "$configuration" + config_file="$STATE_DIR/wpa_supplicant-$interface.conf" + [[ -f $config_file && -O $config_file ]] && rm -f "$config_file" return 1 fi } @@ -94,7 +94,8 @@ wpa_start() { ## Stop an instance of the wpa supplicant # $1: interface name wpa_stop() { - local interface=$1 config_file="$STATE_DIR/wpa_supplicant_$1.conf" + local interface=$1 config_file="$STATE_DIR/wpa_supplicant-$1.conf" + local pidfile="/run/wpa_supplicant-$interface.pid" # We need this as long as wpa_cli has a different default than netctl if [[ -z $WPA_CTRL_DIR && -z $WPAConfigFile ]]; then WPA_CTRL_DIR="/run/wpa_supplicant" @@ -107,8 +108,8 @@ wpa_stop() { [[ -f $config_file && -O $config_file ]] && rm -f "$config_file" # Wait up to one second for the pid file to be removed - if ! timeout_wait 1 '[[ ! -f "/run/wpa_supplicant_$interface.pid" ]]'; then - kill "$(< "/run/wpa_supplicant_$interface.pid")" &> /dev/null + if ! timeout_wait 1 '[[ ! -f $pidfile ]]'; then + kill "$(< "$pidfile")" &> /dev/null fi } @@ -192,7 +193,7 @@ wpa_unquote() { ## Create a configuration file for wpa_supplicant without any network blocks # $1: interface name wpa_make_config_file() { - local config_file="$STATE_DIR/wpa_supplicant_$1.conf" + local config_file="$STATE_DIR/wpa_supplicant-$1.conf" if [[ -e $config_file ]]; then report_debug "The anticipated filename '$config_file' is not available" diff --git a/src/netctl-auto b/src/netctl-auto index b25d258..f78efe3 100755 --- a/src/netctl-auto +++ b/src/netctl-auto @@ -8,6 +8,7 @@ : ${ACTIOND:=wpa_actiond -p /run/wpa_supplicant} : ${ACTION_SCRIPT:=$SUBR_DIR/auto.action} + usage() { cat << END Usage: netctl-auto {COMMAND} ... @@ -81,7 +82,7 @@ profile_enable_disable() { local action="$1" profile="$2" local id interfaces wpa_cmd - if [[ -n "$profile" ]]; then + if [[ $profile ]]; then read -r interfaces id < <(get_wpa_network_id "$profile") || return 1 else interfaces=$(list_netctl_auto_interfaces) @@ -197,7 +198,7 @@ list() { # $1: interface start() { local interface="$1" - local pidfile="$STATE_DIR/wpa_actiond_$1.pid" + local pidfile="$STATE_DIR/wpa_actiond-$interface.pid" if wpa_is_active "$interface"; then exit_error "The interface ($interface) is already in use" @@ -247,7 +248,7 @@ start() { # $1: interface stop() { local interface="$1" - local pidfile="$STATE_DIR/wpa_actiond_$1.pid" + local pidfile="$STATE_DIR/wpa_actiond-$interface.pid" [[ -e "$pidfile" ]] && kill "$(< "$pidfile")" if [[ -x "$PROFILE_DIR/interfaces/$interface" ]]; then @@ -259,6 +260,7 @@ stop() { return 0 } + case $# in 1) case $1 in @@ -292,4 +294,5 @@ case $# in exit_error "$(usage)";; esac + # vim: ft=sh ts=4 et sw=4: diff --git a/src/netctl.in b/src/netctl.in index ea1c9aa..37c095c 100644 --- a/src/netctl.in +++ b/src/netctl.in @@ -97,7 +97,7 @@ unit_enable() { do_readable touch "$unit" echo ".include @systemdsystemunitdir@/netctl@.service" > "$unit" echo -e "\n[Unit]" >> "$unit" - [[ -n $Description ]] && echo "Description=$Description" >> "$unit" + [[ $Description ]] && echo "Description=$Description" >> "$unit" declare -p BindsToInterfaces &> /dev/null || BindsToInterfaces=$Interface if (( ${#BindsToInterfaces[@]} )); then : ${InterfaceRoot=sys/subsystem/net/devices/} -- 2.12.0

1 0