minor fixes to bridgeing scripts

4 files changed, 38 insertions, 1 deletions

diff --git a/package/Depends.mk b/package/Depends.mk
index 277ab22da..59943eeff 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -19,22 +19,32 @@ cbtt-compile: mysql-compile zlib-compile
 collectd-compile: libpthread-compile
 cryptinit-compile: cryptsetup-compile
 cryptsetup-compile: libgcrypt-compile popt-compile e2fsprogs-compile lvm-compile
+
 ifeq (${ADK_COMPILE_CTORRENT_WITH_UCLIBCXX},y)
 ctorrent-compile: uclibc++-compile
 endif
 ctorrent-compile: openssl-compile
+
 cups-compile: zlib-compile
 curl-compile: openssl-compile zlib-compile
-cxxtools-compile: libiconv-compile
+
 ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
 cxxtools-compile: uclibc++-compile
 endif
+cxxtools-compile: libiconv-compile
+
 cyrus-sasl-compile: openssl-compile
+
+ifeq (${ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX},y)
+dansguardian-compile: uclibc++-compile
+endif
 dansguardian-compile: pcre-compile zlib-compile
+
 ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},)
 davfs2-compile: fuse-compile
 endif
 davfs2-compile: libiconv-compile neon-compile
+
 dbus-compile: expat-compile
 deco-compile: ncurses-compile
 dhcpv6-compile: libnl-compile ncurses-compile
diff --git a/package/base-files/extra/etc/network/if-post-down.d/bridge b/package/base-files/extra/etc/network/if-post-down.d/bridge
new file mode 100755
index 000000000..eda1fe3bf
--- /dev/null
+++ b/package/base-files/extra/etc/network/if-post-down.d/bridge
@@ -0,0 +1,24 @@
+#!/bin/sh
+  
+if [ ! -x /usr/sbin/brctl ]
+then
+  exit 0
+fi
+
+case "$IF_BRIDGE_PORTS" in
+    "")
+        exit 0
+        ;;
+    none)
+        INTERFACES=""
+        ;;
+    *)
+        INTERFACES="$IF_BRIDGE_PORTS"
+        ;;
+esac
+  
+for IF in $INTERFACES; do
+  ip link set down dev $IF && brctl delif $IFACE $IF
+done
+
+ip link set down dev $IFACE || exit 1
diff --git a/package/base-files/extra/etc/network/if-pre-up.d/bridge b/package/base-files/extra/etc/network/if-pre-up.d/bridge
index 766084de1..766084de1 100644..100755
--- a/package/base-files/extra/etc/network/if-pre-up.d/bridge
+++ b/package/base-files/extra/etc/network/if-pre-up.d/bridge
diff --git a/package/base-files/extra/usr/sbin/update b/package/base-files/extra/sbin/update
index 57e9cf268..a812bb23d 100755
--- a/package/base-files/extra/usr/sbin/update
+++ b/package/base-files/extra/sbin/update
@@ -9,6 +9,7 @@ fi
 cd /
 
 mount -o remount,rw /
+umount /etc
 
 check_exit() {
 	if [ $? -ne 0 ];then
@@ -59,5 +60,7 @@ case $1 in
 esac
 
 sync
+mount --bind /etc /tmp/.cfgfs/root
 
+echo "Check with cfgfs status if you need to merge and save any changes in /etc."
 echo "You should reboot now."