aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-05-30 19:38:38 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-05-30 19:38:38 +0000
commit340f1875ed67c4df30612f9fcd86b6fe9307c77a (patch)
treeeb392a5dc848616550a5c47b5a2481f8e6b8bc1f /package/base-files
parentf45baccdc5081fc6245c9d567ddb47518f3dc84b (diff)
downloadupstream-340f1875ed67c4df30612f9fcd86b6fe9307c77a.tar.gz
upstream-340f1875ed67c4df30612f9fcd86b6fe9307c77a.tar.bz2
upstream-340f1875ed67c4df30612f9fcd86b6fe9307c77a.zip
resync with kamikaze
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3844 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
-rwxr-xr-xpackage/base-files/default/etc/functions.sh4
-rwxr-xr-xpackage/base-files/default/etc/init.d/S10boot3
2 files changed, 6 insertions, 1 deletions
diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index 858dc286ad..d54a346315 100755
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -61,3 +61,7 @@ config_get() {
config_set() {
export CONFIG_${1}_${2}="${3}"
}
+
+load_modules() {
+ sed 's/^[^#]/insmod &/' $* | ash 2>&- || :
+}
diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 0cc519d8eb..42bb438861 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -1,4 +1,5 @@
#!/bin/sh
+. /etc/functions.sh
[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
vconfig set_name_type VLAN_PLUS_VID_NO_PAD
@@ -16,7 +17,7 @@ for iface in $(/sbin/ifconfig -a | awk '{print $1}' | grep eth); do
/usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug net
done
-sed 's/^[^#]/insmod &/' /etc/modules /etc/modules.d/* 2>&-|ash
+load_modules /etc/modules /etc/modules.d/*
ifconfig lo 127.0.0.1 up
ifconfig eth0 promisc