Move romount to mount-ro and use the umount -r option as it's more reliable for / --bind mounts, Gentoo #239922. Thanks to Duncan.
This commit is contained in:
parent
45044c9239
commit
42e6a95b1d
2
init.d/.gitignore
vendored
2
init.d/.gitignore
vendored
@ -7,8 +7,8 @@ hostname
|
|||||||
killprocs
|
killprocs
|
||||||
local
|
local
|
||||||
localmount
|
localmount
|
||||||
|
mount-ro
|
||||||
netmount
|
netmount
|
||||||
romount
|
|
||||||
root
|
root
|
||||||
savecache
|
savecache
|
||||||
swap
|
swap
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
NET_LO= net.lo
|
NET_LO= net.lo
|
||||||
|
|
||||||
SRCS+= devfs.in dmesg.in hwclock.in consolefont.in keymaps.in killprocs.in \
|
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
|
termencoding.in
|
||||||
|
|
||||||
# This really belongs with sysvinit
|
# This really belongs with sysvinit
|
||||||
|
@ -37,7 +37,7 @@ start()
|
|||||||
fs="${fs}${fs:+|}${x}"
|
fs="${fs}${fs:+|}${x}"
|
||||||
done
|
done
|
||||||
[ -n "${fs}" ] && fs="^(${fs})$"
|
[ -n "${fs}" ] && fs="^(${fs})$"
|
||||||
do_unmount "mount -n -o remount,ro" \
|
do_unmount "umount -r" \
|
||||||
--skip-point-regex "${m}" \
|
--skip-point-regex "${m}" \
|
||||||
${fs:+--skip-fstype-regex} ${fs} --nonetdev
|
${fs:+--skip-fstype-regex} ${fs} --nonetdev
|
||||||
eoutdent
|
eoutdent
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
SYSINIT+= devfs dmesg
|
SYSINIT+= devfs dmesg
|
||||||
BOOT+= hwclock keymaps modules mtab net.lo procfs termencoding
|
BOOT+= hwclock keymaps modules mtab net.lo procfs termencoding
|
||||||
SHUTDOWN+= killprocs romount
|
SHUTDOWN+= killprocs mount-ro
|
||||||
|
|
||||||
# This really belongs with sysvinit
|
# This really belongs with sysvinit
|
||||||
SHUTDOWN+= halt
|
SHUTDOWN+= halt
|
||||||
|
@ -28,11 +28,11 @@ do_unmount()
|
|||||||
mountinfo --quiet "${mnt}" || continue
|
mountinfo --quiet "${mnt}" || continue
|
||||||
|
|
||||||
case "${cmd}" in
|
case "${cmd}" in
|
||||||
umount*)
|
umount)
|
||||||
ebegin "Unmounting ${mnt}"
|
ebegin "Unmounting ${mnt}"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
ebegin "Remounting ${mnt}"
|
ebegin "Remounting ${mnt} read only"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user