From 11a26c7947fc54521e5e380518937dba7f07d8ca Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 20 Oct 2011 10:51:04 +0200
Subject: try to mount secondary filesystems after modules are loaded

---
 package/base-files/Makefile                              | 2 +-
 package/base-files/src/etc/init.d/boot                   | 4 ++++
 package/base-files/src/etc/network/if-pre-up.d/03-bridge | 4 +++-
 package/base-files/src/init                              | 1 -
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index fa1fecd86..b00b81918 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		48
+PKG_RELEASE:=		49
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
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
-- 
cgit v1.2.3