Attachment #286125 for bug #381783

Lines 34-41 start() Link Here

(-)a/init.d/localmount.in (-3 / +7 lines)
34	stop()	34	stop()
35	{	35	{
36	# We never unmount / or /dev or $RC_SVCDIR	36	# We never unmount / or /dev or $RC_SVCDIR
37	local x= no_umounts_r="/\|/dev\|/dev/.*\|${RC_SVCDIR}"	37
38	no_umounts_r="${no_umounts_r}\|/bin\|/sbin\|/lib\|/libexec"	38	# Bug 381783
		39	local rc_svcdir=$(echo $RC_SVCDIR \| sed 's:/lib$32\\|64$\?/:/lib(32\|64)?/:g')
		40
		41	local x= no_umounts_r="/\|/dev\|/dev/.*\|${rc_svcdir}"
		42	no_umounts_r="${no_umounts_r}\|/bin\|/sbin\|/lib(32\|64)?\|/libexec"
39	# RC_NO_UMOUNTS is an env var that can be set by plugins	43	# RC_NO_UMOUNTS is an env var that can be set by plugins
40	local IFS="$IFS:"	44	local IFS="$IFS:"
41	for x in $no_umounts $RC_NO_UMOUNTS; do	45	for x in $no_umounts $RC_NO_UMOUNTS; do
Lines 69-75 stop() Link Here
69	done	73	done
70	[ -n "$fs" ] && fs="^($fs)$"	74	[ -n "$fs" ] && fs="^($fs)$"
71	do_unmount umount --skip-point-regex "$no_umounts_r" \	75	do_unmount umount --skip-point-regex "$no_umounts_r" \
72	${fs:+--skip-fstype-regex} $fs --nonetdev	76	"${fs:+--skip-fstype-regex}" $fs --nonetdev
73	eoutdent	77	eoutdent
74		78
75	return 0	79	return 0

Lines 19-26 start() Link Here

(-)a/init.d/mount-ro.in (-4 / +7 lines)
19	# We need the do_unmount function	19	# We need the do_unmount function
20	. "$RC_LIBEXECDIR"/sh/rc-mount.sh	20	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
21	eindent	21	eindent
22	local m="/dev\|/dev/.\|/proc\|/proc.\|/sys\|/sys/.*\|${RC_SVCDIR}" x= fs=	22
23	m="$m\|/bin\|/sbin\|/lib\|/libexec"	23	# Bug 381783
		24	local rc_svcdir=$(echo $RC_SVCDIR \| sed 's:/lib$32\\|64$\?/:/lib(32\|64)?/:g')
		25
		26	local m="/dev\|/dev/.\|/proc\|/proc.\|/sys\|/sys/.*\|${rc_svcdir}" x= fs=
		27	m="$m\|/bin\|/sbin\|/lib(32\|64)?\|/libexec"
24	# RC_NO_UMOUNTS is an env var that can be set by plugins	28	# RC_NO_UMOUNTS is an env var that can be set by plugins
25	local IFS="$IFS:"	29	local IFS="$IFS:"
26	for x in $no_umounts $RC_NO_UMOUNTS; do	30	for x in $no_umounts $RC_NO_UMOUNTS; do
Lines 34-40 start() Link Here
34	[ -n "$fs" ] && fs="^($fs)$"	38	[ -n "$fs" ] && fs="^($fs)$"
35	do_unmount "umount -r" \	39	do_unmount "umount -r" \
36	--skip-point-regex "$m" \	40	--skip-point-regex "$m" \
37	${fs:+--skip-fstype-regex} $fs --nonetdev	41	"${fs:+--skip-fstype-regex}" $fs --nonetdev
38	eoutdent	42	eoutdent
39	eend $?	43	eend $?
40	}	44	}
41	-

Return to bug 381783