From b86af28c50de9285a5b064d984c3c9ba60d8b1d2 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sun, 24 Jun 2012 15:50:18 +0200 Subject: mounting: let systemd-remount-fs deal with overwriting mount options Any api filesystem which appears in fstab is remounted with the correct mount options at the end of boot. Also, move the binfmt mount to where it is needed. Signed-off-by: Tom Gundersen --- rc.multi | 2 ++ rc.sysinit | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rc.multi b/rc.multi index d558753..daf2372 100755 --- a/rc.multi +++ b/rc.multi @@ -12,6 +12,8 @@ run_hook multi_start /usr/lib/systemd/systemd-sysctl # Load additional binary formats +mountpoint -q /proc/sys/fs/binfmt_misc || mount /proc/sys/fs/binfmt_misc &>/dev/null || + mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc /usr/lib/systemd/systemd-binfmt # Start daemons diff --git a/rc.sysinit b/rc.sysinit index b2ee6c3..a40cc06 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -25,12 +25,8 @@ mountpoint -q /run || mount -t tmpfs run /run -o mode=0755,nosuid,nodev mountpoint -q /dev || mount -t devtmpfs dev /dev -o mode=0755,nosuid mkdir -p -m 1777 /run/lock mkdir -p /dev/{pts,shm} -mountpoint -q /dev/pts || mount /dev/pts &>/dev/null || - mount -t devpts devpts /dev/pts -o mode=0620,gid=5,nosuid,noexec -mountpoint -q /dev/shm || mount /dev/shm &>/dev/null || - mount -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev -mountpoint -q /proc/sys/fs/binfmt_misc || mount /proc/sys/fs/binfmt_misc &>/dev/null || - mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc +mountpoint -q /dev/pts || mount -t devpts devpts /dev/pts -o mode=0620,gid=5,nosuid,noexec +mountpoint -q /dev/shm || mount -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev # log all console messages bootlogd -p /run/bootlogd.pid -- cgit v1.2.3