[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9c47987e25af93f88bfddc38c84da045dda2273d

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 2075 bytes --]

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 "IPFire 2.x development tree".

The branch, master has been updated
       via  9c47987e25af93f88bfddc38c84da045dda2273d (commit)
      from  e21cef27840dbca07a4fea3e677ab422c4a90b45 (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 9c47987e25af93f88bfddc38c84da045dda2273d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Jan 30 17:39:34 2015 +0100

    hostapd: undo rename if dual interfaces are not supported.

-----------------------------------------------------------------------

Summary of changes:
 lfs/hostapd                    | 2 +-
 src/initscripts/init.d/hostapd | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/lfs/hostapd b/lfs/hostapd
index d066db2..74c2ae8 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 32
+PAK_VER    = 33
 
 DEPS       = ""
 
diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index 357452c..1e7cec4 100644
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -112,7 +112,12 @@ case "${1}" in
 			ip link set ${INTERFACE} name ${INTERFACE}_man
 			iw dev  ${INTERFACE}_man interface add ${INTERFACE} type __ap
 			evaluate_retval;
-			/usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf >/dev/null 2>&1 &
+			if [ -d /sys/class/net/${INTERFACE} ]; then
+				/usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf >/dev/null 2>&1 &
+			else
+				ip link set ${INTERFACE}_man down
+				ip link set ${INTERFACE}_man name ${INTERFACE}
+			fi
 			exit 0;
 		else
 			echo_ok


hooks/post-receive
--
IPFire 2.x development tree