diff options
| author | Roy Marples <roy@marples.name> | 2008-11-04 11:30:15 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-11-04 11:30:15 +0000 |
| commit | 42e6a95b1d691b2fcdb49cd57f8ae94acbe27a2c (patch) | |
| tree | 19727d3a3b7aef12d0ea23ead1f20d3652d9574d | |
| parent | 45044c9239ef5eb06a3cc9e5110131cd0d8210ef (diff) | |
| download | openrc-42e6a95b1d691b2fcdb49cd57f8ae94acbe27a2c.tar.gz openrc-42e6a95b1d691b2fcdb49cd57f8ae94acbe27a2c.tar.bz2 openrc-42e6a95b1d691b2fcdb49cd57f8ae94acbe27a2c.tar.xz | |
Move romount to mount-ro and use the umount -r option as it's more reliable for / --bind mounts, Gentoo #239922. Thanks to Duncan.
| -rw-r--r-- | init.d/.gitignore | 2 | ||||
| -rw-r--r-- | init.d/Makefile.Linux | 2 | ||||
| -rw-r--r-- | init.d/mount-ro.in | 2 | ||||
| -rw-r--r-- | runlevels/Makefile.Linux | 2 | ||||
| -rw-r--r-- | sh/rc-mount.sh | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/init.d/.gitignore b/init.d/.gitignore index dace4de..626d7a2 100644 --- a/init.d/.gitignore +++ b/init.d/.gitignore @@ -7,8 +7,8 @@ hostname killprocs local localmount +mount-ro netmount -romount root savecache swap diff --git a/init.d/Makefile.Linux b/init.d/Makefile.Linux index 1bf3fe7..fa4a6d0 100644 --- a/init.d/Makefile.Linux +++ b/init.d/Makefile.Linux @@ -1,7 +1,7 @@ NET_LO= net.lo SRCS+= devfs.in dmesg.in hwclock.in consolefont.in keymaps.in killprocs.in \ - modules.in mtab.in numlock.in procfs.in romount.in sysfs.in \ + modules.in mount-ro.in mtab.in numlock.in procfs.in sysfs.in \ termencoding.in # This really belongs with sysvinit diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in index e39384a..2fb83c0 100644 --- a/init.d/mount-ro.in +++ b/init.d/mount-ro.in @@ -37,7 +37,7 @@ start() fs="${fs}${fs:+|}${x}" done [ -n "${fs}" ] && fs="^(${fs})$" - do_unmount "mount -n -o remount,ro" \ + do_unmount "umount -r" \ --skip-point-regex "${m}" \ ${fs:+--skip-fstype-regex} ${fs} --nonetdev eoutdent diff --git a/runlevels/Makefile.Linux b/runlevels/Makefile.Linux index 8e086aa..2143a7e 100644 --- a/runlevels/Makefile.Linux +++ b/runlevels/Makefile.Linux @@ -1,6 +1,6 @@ SYSINIT+= devfs dmesg BOOT+= hwclock keymaps modules mtab net.lo procfs termencoding -SHUTDOWN+= killprocs romount +SHUTDOWN+= killprocs mount-ro # This really belongs with sysvinit SHUTDOWN+= halt diff --git a/sh/rc-mount.sh b/sh/rc-mount.sh index 135f2f5..154fe80 100644 --- a/sh/rc-mount.sh +++ b/sh/rc-mount.sh @@ -28,11 +28,11 @@ do_unmount() mountinfo --quiet "${mnt}" || continue case "${cmd}" in - umount*) + umount) ebegin "Unmounting ${mnt}" ;; *) - ebegin "Remounting ${mnt}" + ebegin "Remounting ${mnt} read only" ;; esac |