diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-21 11:34:55 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-21 11:34:55 +0200 |
| commit | deb96b0a843e6e133d4334996dc28373972bea5d (patch) | |
| tree | 1b1d5c1928f4cf91692517f330e543725731b3f7 /package/base-files/src | |
| parent | 50345b17210bea8b96200fa618d65adf3c3f0b66 (diff) | |
| parent | ded3b4fdf4b0171762288f22a532c7306ddb3cbc (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/base-files/src')
| -rw-r--r-- | package/base-files/src/etc/init.d/boot | 4 | ||||
| -rwxr-xr-x | package/base-files/src/etc/network/if-pre-up.d/03-bridge | 4 | ||||
| -rwxr-xr-x | package/base-files/src/init | 1 |
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 |