diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
| commit | 58d31896056e604185acf3606b99257cea519dd1 (patch) | |
| tree | 3a0fb34da5dbe8dc12326fcd7fbf0c3916028f41 /package/base-files/src/init | |
| parent | 220a96f9926788ed531717f78e44fdf1e7ab3b34 (diff) | |
| parent | 845317b460ee99ad633534cad4de72404af7e30b (diff) | |
resolve merge conflicts
Diffstat (limited to 'package/base-files/src/init')
| -rwxr-xr-x | package/base-files/src/init | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/package/base-files/src/init b/package/base-files/src/init index e290cee95..fc4ec8cb9 100755 --- a/package/base-files/src/init +++ b/package/base-files/src/init @@ -16,8 +16,7 @@ exec 0<>/dev/console >&0 2>&0 echo >/dev/mdev.seq echo "/sbin/mdev" >/proc/sys/kernel/hotplug mdev -s -mount -o remount,rw / cat /etc/.rnd >/dev/urandom 2>&1 -[ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} -[ -f /etc/fstab ] && mount -a +[ -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 |