From 04b73c418608b5e3c9c21ae176999882e481d578 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Jan 2011 12:09:31 +0100 Subject: unblock wlan before starting networking --- package/base-files/src/etc/network/if-pre-up.d/04-wireless | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/base-files') 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 -- cgit v1.2.3 From f710a956089686dc168fe3cb8d2ebd6cb997c9ba Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 7 Jan 2011 18:21:31 +0100 Subject: base-files: change access mode of /tmp where it's created Signed-off-by: Phil Sutter --- mk/image.mk | 1 - package/base-files/Makefile | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'package/base-files') diff --git a/mk/image.mk b/mk/image.mk index 1b7178eef..c7f568c26 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -14,7 +14,6 @@ image-prepare-post: dd if=$$rng bs=512 count=1 >>${TARGET_DIR}/etc/.rnd 2>/dev/null; \ chmod 600 ${TARGET_DIR}/etc/.rnd chmod 4511 ${TARGET_DIR}/bin/busybox - chmod 1777 ${TARGET_DIR}/tmp @if [ -d ${TARGET_DIR}/usr/share/fonts/X11 ];then \ for i in $$(ls ${TARGET_DIR}/usr/share/fonts/X11/);do \ mkfontdir ${TARGET_DIR}/usr/share/fonts/X11/$${i}; \ diff --git a/package/base-files/Makefile b/package/base-files/Makefile index db08b8860..a78326074 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -50,6 +50,7 @@ endif 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 -- cgit v1.2.3 From 4935edd89d6019323d7c67fd9692cebe0f110496 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 7 Jan 2011 18:21:51 +0100 Subject: make installation of package network hooks optional Signed-off-by: Phil Sutter --- Config.in | 11 +++++++++++ package/base-files/Makefile | 2 ++ package/ppp/Makefile | 4 ++++ 3 files changed, 17 insertions(+) (limited to 'package/base-files') diff --git a/Config.in b/Config.in index 1216099db..1d8473380 100644 --- a/Config.in +++ b/Config.in @@ -58,6 +58,17 @@ config ADK_INSTALL_PACKAGE_INIT_SCRIPTS Note that without further customisation, turning this option off will almost certainly render the resulting system unusable. +config ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS + boolean "ship custom network-scripts along with packages" + default y + help + Turning this option to false will prevent the ADK from + installing network-scripts (i.e. files in /etc/network/) for + packages providing any. + + Note that without further customisation, turning this option + off will almost certainly render the resulting system unusable. + source "package/Config.in.auto.global" source "package/Config.in.auto" endmenu diff --git a/package/base-files/Makefile b/package/base-files/Makefile index a78326074..dee9fd9a4 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -45,7 +45,9 @@ 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 diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 591f3ca2a..2c71a603f 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -65,9 +65,11 @@ post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_BIN} ./files/pon ${IDIR_PPP}/usr/sbin/ ${INSTALL_BIN} ./files/poff ${IDIR_PPP}/usr/sbin/ ${INSTALL_DIR} ${IDIR_PPP}/etc/ppp/peers +ifeq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y) $(INSTALL_DIR) ${IDIR_PPP}/etc/network/if-pre-up.d $(INSTALL_BIN) ./files/ppp.pre-up \ ${IDIR_PPP}/etc/network/if-pre-up.d/05-ppp +endif mod-radius-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient @@ -110,11 +112,13 @@ mod-pppumts-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPUMTS}/etc/ppp/templates ${INSTALL_DATA} ./files/etc/ppp/templates/umts \ ${IDIR_PPP_MOD_PPPUMTS}/etc/ppp/templates/ +ifeq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y) $(INSTALL_DIR) ${IDIR_PPP_MOD_PPPUMTS}/etc/network/if-pre-up.d $(INSTALL_DIR) ${IDIR_PPP_MOD_PPPUMTS}/etc/network/if-post-down.d $(INSTALL_BIN) ./files/hso.if-up \ ${IDIR_PPP_MOD_PPPUMTS}/etc/network/if-pre-up.d/06-hso $(INSTALL_BIN) ./files/hso.if-down \ ${IDIR_PPP_MOD_PPPUMTS}/etc/network/if-post-down.d/06-hso +endif include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 6f325a3b2ca801896cc23d9b3c1bc1f0596084cd Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 10 Jan 2011 22:14:50 +0100 Subject: ifupdown: allow setting the bridge forward delay Signed-off-by: Phil Sutter --- package/base-files/src/etc/network/if-pre-up.d/03-bridge | 1 + 1 file changed, 1 insertion(+) (limited to 'package/base-files') 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 -- cgit v1.2.3