From 643fb0177da17bf98474eb2e8f6a5c421bf007c1 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 17 Aug 2008 22:47:21 +0200 Subject: [PATCH] Fix forgotten bluetooth/settings Some work on hostapd/wlanap package --- config/rootfiles/packages/bluez | 1 + config/rootfiles/packages/hostapd | 1 + lfs/bluez | 4 ++++ lfs/hostapd | 4 +++- src/initscripts/init.d/hostapd | 17 +++++++++++------ 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/config/rootfiles/packages/bluez b/config/rootfiles/packages/bluez index be91b7f3b1..ea7811c0b4 100644 --- a/config/rootfiles/packages/bluez +++ b/config/rootfiles/packages/bluez @@ -1,5 +1,6 @@ srv/web/ipfire/cgi-bin/bluetooth.cgi var/ipfire/menu.d/EX-bluetooth.menu +var/ipfire/bluetooth/settings etc/rc.d/init.d/bluetooth etc/rc.d/rc3.d/S16bluetooth etc/rc.d/rc0.d/K84bluetooth diff --git a/config/rootfiles/packages/hostapd b/config/rootfiles/packages/hostapd index 7e23820574..931cb6e5a8 100644 --- a/config/rootfiles/packages/hostapd +++ b/config/rootfiles/packages/hostapd @@ -6,3 +6,4 @@ etc/init.d/hostapd usr/bin/hostapd usr/bin/hostapd_cli var/ipfire/backup/addons/includes/hostapd +usr/local/bin/wlanapctrl diff --git a/lfs/bluez b/lfs/bluez index dc056beafa..93ffc5a08a 100644 --- a/lfs/bluez +++ b/lfs/bluez @@ -117,5 +117,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) echo '# Bluetooth input configuration' > /etc/bluetooth/input.conf echo '# Bluetooth network configuration' > /etc/bluetooth/network.conf echo '# Bluetooth rfcomm configuration' > /etc/bluetooth/rfcomm.conf + mkdir -p /var/ipfire/bluetooth + touch /var/ipfire/bluetooth/settings + chown nobody:nobody /var/ipfire/bluetooth/settings + chmod 644 /var/ipfire/bluetooth/settings @rm -rf $(DIR_SRC)/bluez* @$(POSTBUILD) diff --git a/lfs/hostapd b/lfs/hostapd index 0b3c14199f..bd87ec2676 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 = 2 +PAK_VER = 3 DEPS = "" @@ -84,5 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 644 $(DIR_SRC)/config/backup/includes/hostapd /var/ipfire/backup/addons/includes/hostapd mkdir -p /var/ipfire/wlanap touch /var/ipfire/wlanap/settings + chown nobody:nobody /var/ipfire/wlanap/settings + chmod 644 /var/ipfire/wlanap/settings @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd index 15b4bc347f..f93ae8ef2e 100644 --- a/src/initscripts/init.d/hostapd +++ b/src/initscripts/init.d/hostapd @@ -14,8 +14,8 @@ case "${1}" in # enable wlan module of collectd sed -i -e "s|#LoadPlugin wireless|LoadPlugin wireless|g" /etc/collectd.conf - # Set Atheros Card to master mode - /usr/bin/wlanconfig ath0 destroy > /dev/null + # Set Atheros Cards to master mode + /usr/bin/wlanconfig $INTERFACE destroy > /dev/null /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /dev/null # Set other cards to master mode @@ -31,16 +31,21 @@ case "${1}" in /usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf /dev/tty12 2>&1 & evaluate_retval fi + + # Bring blue up (but not at boot) + if [ "$(basename $0)" == "hostapd" ]; then + /etc/rc.d/init.d/networking/blue start + fi ;; stop) boot_mesg "Stopping hostapd..." - # Set Atheros Card to Managed mode -# /usr/bin/wlanconfig $INTERFACE destroy > /dev/null -# /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode sta > /dev/null + # Set Atheros Card to managed mode + /usr/bin/wlanconfig $INTERFACE destroy > /dev/null + /usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode sta > /dev/null - # Set other cards to master mode + # Set other cards to managed mode #/usr/sbin/iwconfig blue0 mode Managed killproc /usr/bin/hostapd -- 2.39.5