aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2012-06-24 13:50:18 (GMT)
committerTom Gundersen <teg@jklm.no>2012-06-24 14:13:41 (GMT)
commitb86af28c50de9285a5b064d984c3c9ba60d8b1d2 (patch)
treed99eca2ebc2fb3cd1c6fbd237aad1f4a090809f8
parent32a67cdc01639a2080c93f2a0d71859f196b6c7d (diff)
downloadinitscripts-b86af28c50de9285a5b064d984c3c9ba60d8b1d2.tar.xz
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 <teg@jklm.no>
-rwxr-xr-xrc.multi2
-rwxr-xr-xrc.sysinit8
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