[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c2c5bad960f03407b79e7b0afce45157363a55d0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c2c5bad960f03407b79e7b0afce45157363a55d0

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 3741 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, next has been updated
       via  c2c5bad960f03407b79e7b0afce45157363a55d0 (commit)
       via  b53d8ae99b8e2f4164824413b2f771ae54dbe9a7 (commit)
       via  943eab6695bfd0ea20178e44effc97b4b61b0e14 (commit)
      from  6f57c5e01f161afca2698003c6e9ca724d452953 (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 c2c5bad960f03407b79e7b0afce45157363a55d0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Feb 16 15:33:35 2020 +0000

    core142: add udev network-hotplug-bridges script to updater
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit b53d8ae99b8e2f4164824413b2f771ae54dbe9a7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 14 13:48:19 2020 +0000

    udev: Set wireless interfaces into AP mode before adding to bridge
    
    Wireless interfaces cannot be added to the bridge when they are
    still running in station mode. At boot time, the interface will
    be created and it is attempted to attach it to a bridge, which
    fails.
    
    This patch now checks whether the wireless interface is going to
    be an access point, changes the mode accordingly and then attaches
    the interface to the bridge.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Tested-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 943eab6695bfd0ea20178e44effc97b4b61b0e14
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Feb 14 13:48:18 2020 +0000

    udev: Add more logging to bridge hotplug script
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/142/filelists/files | 1 +
 config/udev/network-hotplug-bridges       | 6 ++++++
 2 files changed, 7 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/142/filelists/files b/config/rootfiles/core/142/filelists/files
index 63da6beeb..03d6bd379 100644
--- a/config/rootfiles/core/142/filelists/files
+++ b/config/rootfiles/core/142/filelists/files
@@ -3,6 +3,7 @@ etc/issue
 srv/web/ipfire/cgi-bin/credits.cgi
 var/ipfire/langs
 etc/suricata/suricata.yaml
+lib/udev/network-hotplug-bridges
 opt/pakfire/etc/pakfire.conf
 opt/pakfire/lib/functions.pl
 srv/web/ipfire/cgi-bin/pakfire.cgi
diff --git a/config/udev/network-hotplug-bridges b/config/udev/network-hotplug-bridges
index 5144a7712..33d6d65ba 100644
--- a/config/udev/network-hotplug-bridges
+++ b/config/udev/network-hotplug-bridges
@@ -72,6 +72,7 @@ ZONE=$(detect_zone)
 
 # Cannot proceed if we could not find a zone
 if [ -z "${ZONE}" ]; then
+	logger "Could not find a bridged zone for ${INTERFACE}"
 	exit 0
 fi
 
@@ -92,7 +93,12 @@ case "${MODE}" in
 			#ip link set "${BRIDGE}" up
 		fi
 
+		if grep -q "INTERFACE=${INTERFACE}" "/var/ipfire/wlanap/settings" 2>/dev/null; then
+			iw dev "${INTERFACE}" set type __ap
+		fi
+
 		# Attach the physical device
+		logger "Attach ${INTERFACE} to ${BRIDGE}"
 		ip link set dev "${INTERFACE}" master "${BRIDGE}"
 		ip link set dev "${INTERFACE}" up
 		;;


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