[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7db4c67f8162c2cdadab69207c1931dcb0abd783

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 4587 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  7db4c67f8162c2cdadab69207c1931dcb0abd783 (commit)
       via  d595016bfba0c3b7b2b91c449fdbabb95b0b3974 (commit)
       via  d1b89a12f9d067c5983c410641b11fe7c195a4c9 (commit)
      from  d47c2aaec838991b27e02dd03855828b7c716ce1 (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 7db4c67f8162c2cdadab69207c1931dcb0abd783
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Jan 18 21:36:16 2015 +0100

    kernel: arm7-multi: enable RTC_DRV_MV.

commit d595016bfba0c3b7b2b91c449fdbabb95b0b3974
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Jan 18 21:32:15 2015 +0100

    leds: add mirabox support.

commit d1b89a12f9d067c5983c410641b11fe7c195a4c9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Jan 18 21:29:53 2015 +0100

    hostapd: create additional AP device if switch has failed.

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

Summary of changes:
 config/kernel/kernel.config.armv5tel-ipfire-multi |  2 +-
 config/rootfiles/core/86/filelists/files          |  1 +
 src/initscripts/init.d/hostapd                    | 13 ++++++++++---
 src/initscripts/init.d/leds                       | 11 +++++++++++
 4 files changed, 23 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index 6021171..caf4c44 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -4852,7 +4852,7 @@ CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_VT8500=m
 CONFIG_RTC_DRV_SUNXI=y
-CONFIG_RTC_DRV_MV=m
+CONFIG_RTC_DRV_MV=y
 CONFIG_RTC_DRV_MXC=m
 CONFIG_RTC_DRV_SNVS=m
 CONFIG_RTC_DRV_MOXART=m
diff --git a/config/rootfiles/core/86/filelists/files b/config/rootfiles/core/86/filelists/files
index dcdb65c..a7e9331 100644
--- a/config/rootfiles/core/86/filelists/files
+++ b/config/rootfiles/core/86/filelists/files
@@ -1,5 +1,6 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/leds
 opt/pakfire/etc/pakfire.conf
 usr/lib/firewall/rules.pl
 usr/local/bin/update-bootloader
diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index 8f59a7f..357452c 100644
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -106,8 +106,13 @@ case "${1}" in
 		sleep 2
 
 		if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
-			boot_mesg "Error! Can't set wlan master mode"
-			echo_failure;
+			killproc /usr/bin/hostapd > /dev/null 2>&1
+			boot_mesg "Try to create additional AP device ..." 
+			ip link set ${INTERFACE} down
+			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 &
 			exit 0;
 		else
 			echo_ok
@@ -116,7 +121,9 @@ case "${1}" in
 
 	stop)
 		boot_mesg "Stopping hostapd..."
-
+		ip link set ${INTERFACE} down > /dev/null 2>&1
+		ip link set ${INTERFACE} down_man > /dev/null 2>&1
+		sleep 1
 		killproc /usr/bin/hostapd
 		evaluate_retval
 		;;
diff --git a/src/initscripts/init.d/leds b/src/initscripts/init.d/leds
index faa7650..9f7323f 100644
--- a/src/initscripts/init.d/leds
+++ b/src/initscripts/init.d/leds
@@ -94,6 +94,11 @@ case "${1}" in
 		setup_netdev_trigger nas6210:red:power ${RED_DEV} tx rx
 		setup_netdev_trigger nas6210:red:usb_copy ${GREEN_DEV} tx rx
 
+		# Mirabox start
+		setup_heartbeat_trigger mirabox:green:pwr
+		setup_netdev_trigger mirabox:green:stat ${GREEN_DEV} tx rx
+		setup_netdev_trigger mirabox:blue:stat ${BLUE_DEV} tx rx
+
 		exit 0
 	;;
 
@@ -132,6 +137,12 @@ case "${1}" in
 		disable_led_trigger nas6210:red:power
 		disable_led_trigger nas6210:red:usb_copy
 
+		# Mirabox stop
+		disable_led_trigger mirabox:green:pwr
+		enable_led mirabox:green:pwr
+		disable_led_trigger mirabox:green:stat
+		disable_led_trigger mirabox:blue:stat
+
 		exit 0
 	;;
 


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