Merge branch '2.6.x'

8 files changed, 34 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 711c9e9..0a1de36 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 DESTDIR=
-VERSION=2.6.7
+VERSION=2.6.8
 VPATH = doc
 
 .PHONY: install docs
diff --git a/NEWS b/NEWS
index 75336ec..cecc35b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+version 2.6.8
+- fix broken 802.11 in non-wireless setups (FS#25473)
+- fix rfkill errors in net-auto-wireless (FS#25514)
+- fix error message about non-existing net.ipv6.conf... (FS#25530)
+
 version 2.6.7
 - fix wrong quoting of $profile (FS#25362)
 - fix wrong parsing of wpa_supplicant configuration (FS#25464)
diff --git a/docs/netcfg-profiles.txt b/docs/netcfg-profiles.txt
index def2a37..ae2391d 100644
--- a/docs/netcfg-profiles.txt
+++ b/docs/netcfg-profiles.txt
@@ -1,7 +1,7 @@
-% NETCFG-PROFILES(5) netcfg 2.6.7 | Arch Linux
+% NETCFG-PROFILES(5) netcfg 2.6.8 | Arch Linux
 % Rémy Oudompheng <remy@archlinux.org>
   James Rayner <james@archlinux.org>
-% 8 August 2011
+% 14 August 2011
 
 NAME
 ====
diff --git a/docs/netcfg.txt b/docs/netcfg.txt
index e85abd8..0cb4408 100644
--- a/docs/netcfg.txt
+++ b/docs/netcfg.txt
@@ -1,7 +1,7 @@
-% NETCFG(8) netcfg 2.6.7 | Arch Linux
+% NETCFG(8) netcfg 2.6.8 | Arch Linux
 % Rémy Oudompheng <remy@archlinux.org>
   James Rayner <james@archlinux.org>
-% July 2011
+% 2011-08-14
 
 NAME
 ====
diff --git a/scripts/netcfg b/scripts/netcfg
index 63fed27..82a9618 100755
--- a/scripts/netcfg
+++ b/scripts/netcfg
@@ -2,7 +2,7 @@
 
 . /usr/lib/network/network
 
-NETCFG_VER=2.6.7
+NETCFG_VER=2.6.8
 
 version()
 {
diff --git a/src/connections/ethernet b/src/connections/ethernet
index f9c660c..04d65fa 100644
--- a/src/connections/ethernet
+++ b/src/connections/ethernet
@@ -37,7 +37,12 @@ ethernet_up() {
         . "$SUBR_DIR/8021x"
         [[ -z "$WPA_CONF" ]] && WPA_CONF="/etc/wpa_supplicant.conf"
         [[ -z "$WPA_DRIVER" ]] && WPA_DRIVER="wired"
-
+        # Set wpa_supplicant control path (FS#25473)
+        WPA_CTRL_PATH=/var/run/wpa_supplicant
+        if grep "^ *ctrl_interface=" "$WPA_CONF" &>/dev/null; then
+            WPA_CTRL_PATH=$(grep -m 1 "^ *ctrl_interface=" "$WPA_CONF" | tail -n 1 | cut -d= -f 2- | sed -r 's/DIR=(.*) +GROUP=.*/\1/')
+        fi
+ 
         report_debug ethernet_iproute_up start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_DRIVER" "$WPA_OPTS"
         if ! start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_DRIVER" "$WPA_OPTS"; then
             report_fail "wpa_supplicant did not start, possible configuration error"
@@ -127,6 +132,19 @@ ethernet_up() {
         done
     fi
 
+    # Load ipv6 module if necessary (FS#25530)
+    case "$IP6" in
+    dhcp*|stateless|static)
+        [ -d "/proc/sys/net/ipv6" ] || modprobe ipv6
+        ;;
+    ""|no)
+        [ -d /proc/sys/net/ipv6 ] && sysctl -q -w net.ipv6.conf.$INTERFACE.accept_ra=0
+        ;;
+    *)
+        report_iproute "IP6 must be 'dhcp', 'dhcp-noaddr', 'stateless', 'static' or 'no'"
+        ;;
+    esac
+
     case "$IP6" in
     dhcp*)
         if [[ -x /usr/sbin/dhclient ]]; then
@@ -178,12 +196,6 @@ ethernet_up() {
             done
         fi
         ;;
-    ""|no)
-        sysctl -q -w net.ipv6.conf.$INTERFACE.accept_ra=0
-        ;;
-    *)
-        report_iproute "IP6 must be 'dhcp', 'dhcp-noaddr', 'stateless', 'static' or 'no'"
-        ;;
     esac
 
     # Set hostname
diff --git a/src/connections/wireless b/src/connections/wireless
index 7ed5abe..b19afde 100644
--- a/src/connections/wireless
+++ b/src/connections/wireless
@@ -30,8 +30,8 @@ wireless_up() {
     if [ "$SECURITY" = "wpa-config" ]; then
         WPA_CONF="${WPA_CONF:-/etc/wpa_supplicant.conf}"
         # Use defined control path (FS#24949)
-        if grep "ctrl_interface=" "$WPA_CONF" &>/dev/null; then
-            WPA_CTRL_PATH=$(grep -m 1 "^ctrl_interface=" "$WPA_CONF" | tail -n 1 | cut -d= -f 2- | sed -r 's/DIR=(.*) +GROUP=.*/\1/')
+        if grep "^ *ctrl_interface=" "$WPA_CONF" &>/dev/null; then
+            WPA_CTRL_PATH=$(grep -m 1 "^ *ctrl_interface=" "$WPA_CONF" | tail -n 1 | cut -d= -f 2- | sed -r 's/DIR=(.*) +GROUP=.*/\1/')
         fi
     else
         WPA_CONF=$(make_wpa_config_file $INTERFACE)
@@ -122,7 +122,6 @@ wireless_down() {
     # Handle wireless kill switches
     # Any reason why a hardware switch should be considered on interface down?
     if [[ "$RFKILL" == "soft" ]]; then
-        . "$SUBR_DIR/wireless"
         set_rf_state "$INTERFACE" disabled $RFKILL_NAME || return 1
     fi
 }
diff --git a/wpa_actiond/netcfg-wpa_actiond b/wpa_actiond/netcfg-wpa_actiond
index 9ad319f..bb144c3 100755
--- a/wpa_actiond/netcfg-wpa_actiond
+++ b/wpa_actiond/netcfg-wpa_actiond
@@ -21,7 +21,8 @@ case $1 in
         netcfg -i "$interface"
         stop_wpa "$interface"
         kill $(cat "/run/wpa_actiond_${2}.pid")
-        if [[ -n "$RFKILL" ]]; then 
+        # only try to disable software rfkill switches (FS#25514)
+        if [[ "$RFKILL" == "soft" ]]; then
             set_rf_state "$interface" disabled $RFKILL_NAME || exit $?
         fi
         exit