diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-31 16:48:45 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-31 16:48:45 +0100 |
commit | 38136c7702e1940a88f24d09141f07b23b966a1c (patch) | |
tree | b1ba1e95441ce11b8ed84dc3810c7481df26ef92 /package/base-files/src/init | |
parent | 50e7ffe10d0bca1ef5b2d27ebc518b456035a18d (diff) | |
parent | 2dce122bacb8837543ff8e882a1df7284324e357 (diff) |
resolve conflict
Diffstat (limited to 'package/base-files/src/init')
-rwxr-xr-x | package/base-files/src/init | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/base-files/src/init b/package/base-files/src/init index fc4ec8cb9..c1016cc34 100755 --- a/package/base-files/src/init +++ b/package/base-files/src/init @@ -18,5 +18,5 @@ echo "/sbin/mdev" >/proc/sys/kernel/hotplug mdev -s cat /etc/.rnd >/dev/urandom 2>&1 [ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} || mount -o remount,rw / -[ -f /etc/fstab ] && fsck -p >/dev/null ; mount -a +[ -f /etc/fstab ] && { fsck -p >/dev/null ; mount -a; } exec /sbin/init |