diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-22 18:26:51 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-22 18:26:51 +0200 |
| commit | 2b52e67da00817f93884a344a9a8b7e2c585fc8c (patch) | |
| tree | caa9c494197016efa62412c2483e36f011b2d392 /package/base-files | |
| parent | e8f74f7222ddc977bf775e31101980b9311b7200 (diff) | |
| parent | 48b18373159b70caca3f41643804c549552d66f4 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rw-r--r-- | package/base-files/src/etc/banner | 8 | ||||
| -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 |
5 files changed, 15 insertions, 4 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/banner b/package/base-files/src/etc/banner index cc967559a..1ac725fd1 100644 --- a/package/base-files/src/etc/banner +++ b/package/base-files/src/etc/banner @@ -1,2 +1,8 @@ - Linux created with OpenADK + ___ _ ____ _ __ + / _ \ _ __ ___ _ __ / \ | _ \| |/ / +| | | | '_ \ / _ \ '_ \ / _ \ | | | | ' / +| |_| | |_) | __/ | | |/ ___ \| |_| | . \ + \___/| .__/ \___|_| |_/_/ \_\____/|_|\_\ + |_| + Linux created with OpenADK 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 c57149fe3..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;} exec /sbin/init |