summaryrefslogtreecommitdiff
path: root/package/base-files/src
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-10-20 10:51:04 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-10-20 10:51:04 +0200
commit11a26c7947fc54521e5e380518937dba7f07d8ca (patch)
treeafaac68930ea588c68bb8e21b9537fd6d8264d67 /package/base-files/src
parent794a4a75d2e2c513e55b8962ad9e8e470dd82ba8 (diff)
try to mount secondary filesystems after modules are loaded
Diffstat (limited to 'package/base-files/src')
-rw-r--r--package/base-files/src/etc/init.d/boot4
-rwxr-xr-xpackage/base-files/src/etc/network/if-pre-up.d/03-bridge4
-rwxr-xr-xpackage/base-files/src/init1
3 files changed, 7 insertions, 2 deletions
diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot
index ed55ccc88..e30360142 100644
--- a/package/base-files/src/etc/init.d/boot
+++ b/package/base-files/src/etc/init.d/boot
@@ -26,4 +26,8 @@ for f in /etc/modules.d/*; do
done
# settle down, after module load
sleep 2
+# any lvm volumes to activate?
+[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay;}
+# check and mount all filesystems not /
+[ -f /etc/fstab ] && { fsck -p >/dev/null; mount -a; swapon -a;}
exit 0
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 9bdbf8302..916fafadb 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,7 +15,9 @@ case "$IF_BRIDGE_PORTS" in
esac
brctl addbr $IFACE || exit 1
-[[ -n $IF_BRIDGE_FD ]] && brctl setfd $IFACE $IF_BRIDGE_FD
+if [ "$IF_BRIDGE_FD" != "" ]; then
+ brctl setfd $IFACE $IF_BRIDGE_FD
+fi
for IF in $INTERFACES; do
if ! grep -q $IF /proc/net/dev; then
diff --git a/package/base-files/src/init b/package/base-files/src/init
index cfd264c3e..98d24c834 100755
--- a/package/base-files/src/init
+++ b/package/base-files/src/init
@@ -22,5 +22,4 @@ cat /etc/.rnd >/dev/urandom 2>&1
[ -x /kexecinit ] && { /kexecinit; }
[ -x /cryptinit ] && { /cryptinit; exec switch_root /mnt "/init";}
[ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} || mount -o remount,rw /
-[ -f /etc/fstab ] && { fsck -p >/dev/null; mount -a; swapon -a;}
exec /sbin/init