February 2019 - Arch-projects - lists.archlinux.org

[arch-projects] [netctl][PATCH] Move away from using wpa_actiond
by Jouke Witteveen 08 Feb '19

08 Feb '19

The same functionality is provided by wpa_supplicant, so we do not need an extra and Arch Linux specific dependency. --- README | 4 ++-- contrib/PKGBUILD.in | 1 - src/lib/auto.action | 31 ++++++++++++++----------------- src/netctl-auto | 30 +++++++++++++----------------- 4 files changed, 29 insertions(+), 37 deletions(-) diff --git a/README b/README index 95df087..f3ca634 100644 --- a/README +++ b/README @@ -9,8 +9,8 @@ Optional: - dhcpcd or dhclient: for DHCP support - wpa_supplicant: for WPA support - dialog: for the interactive assistant -- ifplugd: for automatic connection -- wpa_actiond: for automatic connection +- ifplugd: for automatic wired connections +- ppp: for PPP support For documentation generation: - asciidoc diff --git a/contrib/PKGBUILD.in b/contrib/PKGBUILD.in index b5ce44c..f3359c6 100644 --- a/contrib/PKGBUILD.in +++ b/contrib/PKGBUILD.in @@ -15,7 +15,6 @@ optdepends=('dialog: for the menu based wifi assistant' 'dhcpcd: for DHCP support (or dhclient)' 'wpa_supplicant: for wireless networking support' 'ifplugd: for automatic wired connections through netctl-ifplugd' - 'wpa_actiond: for automatic wireless connections through netctl-auto' 'ppp: for PPP connections' 'openvswitch: for Open vSwitch connections' ) diff --git a/src/lib/auto.action b/src/lib/auto.action index f81d4e3..999f66f 100755 --- a/src/lib/auto.action +++ b/src/lib/auto.action @@ -5,16 +5,17 @@ . "$SUBR_DIR/ip" export INTERFACE="$1" -export SSID="$2" -export ACTION="$4" +export ACTION="$2" +PROFILE_STATE="$STATE_DIR/netctl-auto-$INTERFACE.profile" -load_profile "$3" load_interface_config "$INTERFACE" case $ACTION in - CONNECT) + CONNECTED) + load_profile "$WPA_ID_STR" DhcpcdOptions+=" -K -L" ip_set || exit 1 + echo "$Profile" > "$PROFILE_STATE" # Sandbox the eval if ! ( do_debug eval "$ExecUpPost" ); then # Failing ExecUpPost will take the connection down @@ -22,20 +23,16 @@ case $ACTION in exit 1 fi ;; - DISCONNECT) - # Sandbox the eval - if ! ( do_debug eval "$ExecDownPre" ); then - exit 1 + DISCONNECTED) + if [[ -s "$PROFILE_STATE" ]]; then + load_profile "$(< "$PROFILE_STATE")" + rm -f "$PROFILE_STATE" + # Sandbox the eval + if ! ( do_debug eval "$ExecDownPre" ); then + exit 1 + fi + ip_unset fi - ip_unset - ;; - LOST|REESTABLISHED) - # Not handled. - exit 0 - ;; - *) - # ??? - exit 1 ;; esac diff --git a/src/netctl-auto b/src/netctl-auto index 18d2e10..7e4062e 100755 --- a/src/netctl-auto +++ b/src/netctl-auto @@ -6,7 +6,6 @@ . "$SUBR_DIR/rfkill" . "$SUBR_DIR/wpa" -: ${ACTIOND:=wpa_actiond -p /run/wpa_supplicant} : ${ACTION_SCRIPT:=$SUBR_DIR/auto.action} @@ -193,11 +192,10 @@ list() { done } -## Start and generate config file for the WPA supplicant, start wpa_actiond +## Start and generate config file for the WPA supplicant, monitor for changes # $1: interface start() { local interface="$1" - local pidfile="$STATE_DIR/wpa_actiond-$interface.pid" if interface_is_up "$interface"; then exit_error "The interface '$interface' is already up" @@ -206,12 +204,11 @@ start() { rf_enable "$interface" "$RFKill" || return 1 fi - local wpa_conf - if ! wpa_conf=$(wpa_make_config_file "$interface"); then + if ! WPAConfigFile=$(wpa_make_config_file "$interface"); then exit_error "Could not create the configuration file for interface '$interface'" fi - # Disable p2p to prevent wpa_supplicant from creating another control interface. - echo "p2p_disabled=1" >> "$wpa_conf" + # Disable p2p to prevent wpa_supplicant from creating another control interface + echo "p2p_disabled=1" >> "$WPAConfigFile" local profile list_profiles | while IFS= read -r profile; do @@ -222,16 +219,16 @@ start() { is_yes "${ExcludeAuto:-no}" && exit # Set default and exclude wpa-config as it does not fit this scheme [[ ${Security:=none} != "wpa-config" ]] || exit - printf '%s\n' "network={" "$(wpa_make_config_block)" "id_str=\"$profile\"" "}" >> "$wpa_conf" + printf '%s\n' "network={" "$(wpa_make_config_block)" "id_str=\"$profile\"" "}" >> "$WPAConfigFile" report_notice "Included profile '$profile'" ) done - # Start the WPA supplicant and wpa_actiond + # Start the WPA supplicant and wpa_cli : ${WPADriver:=nl80211,wext} WPAOptions+=" -W" - if wpa_start "$interface" "$WPADriver" "$wpa_conf"; then - if $ACTIOND -i "$interface" -P "$pidfile" -a "$ACTION_SCRIPT"; then + if wpa_start "$interface" "$WPADriver" "$WPAConfigFile"; then + if wpa_call "$interface" -B -a "$ACTION_SCRIPT"; then return 0 fi wpa_stop "$interface" @@ -241,17 +238,16 @@ start() { return 1 } -## Stop the WPA supplicant and wpa_actiond +## Stop the WPA supplicant, which automatically stops wpa_cli # $1: interface stop() { local interface="$1" - local pidfile="$STATE_DIR/wpa_actiond-$interface.pid" - [[ -e "$pidfile" ]] && kill "$(< "$pidfile")" - timeout_wait 1 '! wpa_is_active "$interface"' || wpa_stop "$interface" + wpa_stop "$interface" bring_interface_down "$interface" - [[ $RFKill ]] && rf_disable "$interface" "$RFKill" - return 0 + if [[ $RFKill ]]; then + rf_disable "$interface" "$RFKill" + fi } ## Remove WPA supplicant configuration files -- 2.20.1

2 2

[arch-projects] [devtools] uses MAKEFLAGS (+others) from /etc/makepkg.conf not /usr/share/devtools/
by james harvey 08 Feb '19

08 Feb '19

I got extremely confused when I accidentally found out that the MAKEFLAGS that is needed to be set for parallel building using devtools is the one in "/etc/makepkg.conf", instead of one like "/usr/share/devtools/makepkg-x86_64.conf". Turns out this is because "makechrootpkg"::20180531-4::638 is: load_vars /etc/makepkg.conf load_vars() only reads "{SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER", so without me having set any of the others, it turns out the only variable it uses from /etc is MAKEFLAGS. For me, I think this is the only makepkg/pacman variable in an entire devtools run that isn't out of /usr/share/devtools, since "archbuild" gives those to "mkarchroot" and "arch-nspawn... pacman -Syu", and they are copied into "/var/lib/archbuild/extra-x86_64/root/etc/" for anything ran in the chroot. Should this be fixed? I originally thought of a new "makechrootpkg -M" option, but I think it could instead run: load_vars ${copydir}/etc/makepkg.conf If not, should "/usr/share/devtools/makepkg-x86_64.conf" be updated with a comment where those variables are, to say they're actually used out of "/etc/makepkg.conf"?

3 5

[arch-projects] [devtools] conf files could be closer to pacman's
by james harvey 07 Feb '19

07 Feb '19

It could be worth a developer diff'ing: * pacman::makepkg.conf and devtools::makepkg-x86_64.conf * pacman::pacman.conf and devtools::pacman*.conf When trying to figure out my /etc/ vs /usr/share/devtools/ confusion with MAKEFLAGS, I saw these differ in more areas than I would have expected. I don't know if any of the differences matter in the end, but I think it's nice they almost match, and I think it would be nicer if they only differ in areas where they need to. They probably used to match better, and diverged in a few areas where they didn't need to. Some of the differences are certainly nitpicky. pacman just dropped "-fstack-protector-strong" since it's enabled by default. https://bugs.archlinux.org/task/54736 Others might matter in some situations, like different options on DLAGENTS. (I'm assuming it's right to have file:// missing from devtools, talkinga bout the curl options.) devtools gives package options "!optipng !upx". devtools has a different comment for XferCommand and IgnorePkg. Stuff like that.

3 2

[arch-projects] [netctl][PATCH] Do not allow the kernel to try and be smarter than us
by Jouke Witteveen 07 Feb '19

07 Feb '19

When accept_ra is set to 1, router advertisements are still ignored if the interface is in forwarding mode. For such configurations, the interface should have a static configuration and netctl already sets accept_ra to 0. Setting it to 2 otherwise forces the kernel to accept router advertisements regardless of the forwarding setting. --- src/lib/ip | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib/ip b/src/lib/ip index 65057ab..e3f6a2f 100644 --- a/src/lib/ip +++ b/src/lib/ip @@ -50,13 +50,16 @@ ip_set() { dhcp|dhcp-noaddr|stateless|static) [[ -d "/proc/sys/net/ipv6" ]] || modprobe ipv6 sysctl -q -w "net.ipv6.conf.$interface_sysctl.disable_ipv6=0" - [[ $IP6 == "static" ]] - sysctl -q -w "net.ipv6.conf.$interface_sysctl.accept_ra=$?" + if [[ $IP6 == "static" ]]; then + sysctl -q -w "net.ipv6.conf.$interface_sysctl.accept_ra=0" + else # Accept router advertisements regardless of the forwarding setting + sysctl -q -w "net.ipv6.conf.$interface_sysctl.accept_ra=2" + fi ;; no) [[ -d "/proc/sys/net/ipv6" ]] && sysctl -q -w "net.ipv6.conf.$interface_sysctl.disable_ipv6=1" ;; - "") # undefined IP6 does not prevent RA's from being received -> nop + "") # Having IP6= unset does not prevent router advertisements from being received ;; *) report_error "IP6 must be 'dhcp', 'dhcp-noaddr', 'stateless', 'static' or 'no'" -- 2.20.1

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.19-1-gea9ccfd
by Jouke Witteveen 07 Feb '19

07 Feb '19

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 "Network control utility based on systemd". The branch, master has been updated via ea9ccfd2e249880c9b09553c3963a9b3d735faca (commit) from e0014041ad40c9385bb2c38aad2acae3c93eb512 (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 ea9ccfd2e249880c9b09553c3963a9b3d735faca Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Sat Jan 26 20:59:51 2019 -0500 Makefile: specify the correct shell to use The Makefile commands in use include bash-specific features like brace expansion, and thus cannot run under the default /bin/sh shell as that may or may not be GNU bash (bash supports brace expansion even in posix mode). Consequently, the Makefile failed to execute correctly when the system /bin/sh was a different sh implementation, such as dash or busybox ash. Fix this by declaring the SHELL which will be used when running all commands. ----------------------------------------------------------------------- Summary of changes: Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- Network control utility based on systemd

1 0