Fix updater (now real core18)

fix missing newline at core17 filelist
hostapd initscript now works also with eg. blue2

diff --git a/config/rootfiles/core/17/files b/config/rootfiles/core/17/files
index d9decc4ff99c5c52a0c812cc1f9f76ed5a14911b..bed4f1c2874e631b6b67fae47e81cb9cb070b98e 100644 (file)
--- a/config/rootfiles/core/17/files
+++ b/config/rootfiles/core/17/files
@@ -1,3 +1,3 @@
 etc/squid
 usr/lib/squid
-usr/sbin/squid
\ No newline at end of file
+usr/sbin/squid

diff --git a/config/rootfiles/updater/filelists/core17 b/config/rootfiles/updater/filelists/core17
index d9decc4ff99c5c52a0c812cc1f9f76ed5a14911b..bed4f1c2874e631b6b67fae47e81cb9cb070b98e 100644 (file)
--- a/config/rootfiles/updater/filelists/core17
+++ b/config/rootfiles/updater/filelists/core17
@@ -1,3 +1,3 @@
 etc/squid
 usr/lib/squid
-usr/sbin/squid
\ No newline at end of file
+usr/sbin/squid

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 6a313c8f7716ad7cecdb760a0544fd93aea6f173..eafdf3e9f5adc9c8f4a50e47defe9aa4251ba1dc 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -263,7 +263,7 @@
 * sox-12.18.1
 * spandsp-0.0.4pre15
 * squashfs3.2-r2
-* squid-2.7.STABLE3
+* squid-2.7.STABLE4
 * squidGuard-1.3
 * squidclamav-3.5
 * sudo-1.6.8p12

diff --git a/lfs/hostapd b/lfs/hostapd
index a46786687fde756f052326284eada50235b9d58e..3974d7c940355afa68b2a2f4204d5ee167c93493 100644 (file)
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -84,7 +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
-       cp -vrf $(DIR_SRC)/config/hostapd/hostapd.conf /var/ipfire/wlanap/etc/hostapd.conf
+       cp -vrf $(DIR_SRC)/config/hostapd/hostapd.conf /var/ipfire/wlanap/hostapd.conf
        chown nobody:nobody /var/ipfire/wlanap/*
        chmod 644 /var/ipfire/wlanap/*
        @rm -rf $(DIR_APP)

diff --git a/lfs/updater b/lfs/updater
index ca528137e1bfccb023d7a5ff0d492b130045f02a..c66ae657b0be840e1d8b389f9f0b492aadad94f4 100644 (file)
--- a/lfs/updater
+++ b/lfs/updater
@@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        sed -e "s/NAME/core-upgrade/g" \
                -e "s/VER/2.1/g" \
-               -e "s/RELEASE/16/g" \
+               -e "s/RELEASE/18/g" \
                -e "s/DEPS/$(DEPS)/g" \
-               -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-17.ipfire | awk '{ print $$5 }'`/g" \
-               < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-17
+               -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-18.ipfire | awk '{ print $$5 }'`/g" \
+               < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-18

diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index b629d32b71c16ba79f16b11efb917a3233b57357..f894b1a63af2fabfc9febe70638c69a7122a0676 100644 (file)
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -35,11 +35,7 @@ case "${1}" in
                # Bring blue up (but not at boot)
                if [ "$(basename $0)" == "hostapd" ]; then
                        
-                       if [ "$(INTERFACE)" == "blue0" ]; then
-                               /etc/rc.d/init.d/networking/blue start
-                       elif [ "$(INTERFACE)" == "green0" ]; then
-                               /etc/rc.d/init.d/networking/green start
-                       fi
+                       /etc/rc.d/init.d/networking/${INTERFACE//[0-9]/} start
                        
                        if [ -f /var/ipfire/dhcp/enable_blue || -f /var/ipfire/dhcp/enable_green ]; then
                                /etc/rc.d/init.d/dhcp restart