summaryrefslogtreecommitdiff
path: root/package/base-files
diff options
context:
space:
mode:
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/Makefile3
-rwxr-xr-xpackage/base-files/src/etc/network/if-pre-up.d/03-bridge1
-rwxr-xr-xpackage/base-files/src/etc/network/if-pre-up.d/04-wireless2
3 files changed, 6 insertions, 0 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index db08b8860..dee9fd9a4 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -45,11 +45,14 @@ endif
mkdir -p $(IDIR_BASE_FILES)/usr/lib/ipkg/lists
mkdir -p $(IDIR_BASE_FILES)/etc/crontabs
mkdir -p $(IDIR_BASE_FILES)/{dev,boot,root,sys,proc,tmp,mnt}
+ifeq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y)
mkdir -p $(IDIR_BASE_FILES)/etc/network/{if-pre-up.d,if-up.d,if-down.d,if-post-down.d}
+endif
mkdir -p $(IDIR_BASE_FILES)/usr/{lib,bin}
chmod 755 $(IDIR_BASE_FILES)/lib/mdev/init
chmod 600 $(IDIR_BASE_FILES)/etc/shadow
chmod 600 $(IDIR_BASE_FILES)/etc/network/interfaces
+ chmod 1777 ${IDIR_BASE_FILES}/tmp
ln -sf ../proc/mounts $(IDIR_BASE_FILES)/etc/mtab
rm -rf $(IDIR_BASE_FILES)/var
ln -sf tmp $(IDIR_BASE_FILES)/var
diff --git a/package/base-files/src/etc/network/if-pre-up.d/03-bridge b/package/base-files/src/etc/network/if-pre-up.d/03-bridge
index 41ddb2b58..9bdbf8302 100755
--- a/package/base-files/src/etc/network/if-pre-up.d/03-bridge
+++ b/package/base-files/src/etc/network/if-pre-up.d/03-bridge
@@ -15,6 +15,7 @@ case "$IF_BRIDGE_PORTS" in
esac
brctl addbr $IFACE || exit 1
+[[ -n $IF_BRIDGE_FD ]] && brctl setfd $IFACE $IF_BRIDGE_FD
for IF in $INTERFACES; do
if ! grep -q $IF /proc/net/dev; then
diff --git a/package/base-files/src/etc/network/if-pre-up.d/04-wireless b/package/base-files/src/etc/network/if-pre-up.d/04-wireless
index 78442d8ae..ebcec5a12 100755
--- a/package/base-files/src/etc/network/if-pre-up.d/04-wireless
+++ b/package/base-files/src/etc/network/if-pre-up.d/04-wireless
@@ -8,6 +8,8 @@ set -e
[ "$IF_WIRELESS_HWMODE" ] || IF_WIRELESS_HWMODE=g
[ "$IF_WIRELESS_EXTENSION" ] || IF_WIRELESS_EXTENSION=0
+rfkill unblock wlan 2>/dev/null
+
wpa=0
wpa1=0
wpa2=0