rc_unmount: add parallel unmounting

etc/rc.conf

@@ -92,8 +92,8 @@
 #unicode="YES"
 
 # This is how long fuser should wait for a remote server to respond. The
-# default is 60 seconds, but  it can be adjusted here.
-#rc_fuser_timeout=60
+# default is 20 seconds, but  it can be adjusted here.
+#rc_fuser_timeout=20
 
 # Below is the default list of network fstypes.
 #

init.d/localmount.in

@@ -112,7 +112,7 @@ stop()
 	# Umount loop devices
 	einfo "Unmounting loop devices"
 	eindent
-	do_unmount "umount -d" --skip-point-regex "$no_umounts_r" \
+	rc_unmount -d -- --skip-point-regex "$no_umounts_r" \
 		--node-regex "^/dev/loop"
 	eoutdent
 
@@ -125,7 +125,7 @@ stop()
 		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
-	do_unmount umount --skip-point-regex "$no_umounts_r" \
+	rc_unmount -- --skip-point-regex "$no_umounts_r" \
 		"${fs:+--skip-fstype-regex}" $fs --nonetdev
 	eoutdent
 

init.d/mount-ro.in

@@ -25,8 +25,6 @@ start()
 	sync
 
 	ebegin "Remounting remaining filesystems read-only"
-	# We need the do_unmount function
-	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 	eindent
 
 	# Bug 381783
@@ -48,7 +46,7 @@ start()
 		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
-	do_unmount "umount -r" \
+	rc_unmount -r -- \
 		--skip-point-regex "$m" \
 		"${fs:+--skip-fstype-regex}" $fs --nonetdev
 	ret=$?

init.d/netmount.in

@@ -64,7 +64,6 @@ stop()
 	local x= fs=
 
 	ebegin "Unmounting network filesystems"
-	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
 	for x in $net_fs_list $extra_net_fs_list; do
 		fs="$fs${fs:+,}$x"
@@ -79,7 +78,7 @@ stop()
 		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"
-	do_unmount umount ${fs:+--fstype-regex} $fs --netdev
+	rc_unmount -- ${fs:+--fstype-regex} $fs --netdev
 	retval=$?
 
 	eoutdent

man/openrc-run.8

@@ -550,6 +550,17 @@ The f, F, n, N, o, O, p, P, e and E options specify what you want to
 search for or skip in the mounted file systems. The i, s and t options
 specify what you want to display. If no mount points are given, all
 mount points will be considered.
+.It Xo
+.Ic rc_unmount
+.Op umount args...
+.Op -- mountinfo args...
+.Xc
+Parallel unmounting utility. All arguments before
+.Ic --
+are passed to
+.Xr umount 1
+and arguments after it are processed the same as
+.Xr mountinfo 1 .
 .It Ic yesno Ar value
 If
 .Ar value

sh/meson.build

@@ -9,7 +9,6 @@ sh_conf_data.set('SYSCONFDIR', get_option('sysconfdir'))
 
 sh = [
   'rc-functions.sh',
-  'rc-mount.sh',
   'runit.sh',
   's6.sh',
   'start-stop-daemon.sh',

src/mountinfo/meson.build

@@ -1,7 +1,9 @@
-executable('mountinfo',
-  ['mountinfo.c', misc_c, usage_c, version_h],
-  c_args : cc_branding_flags,
-  include_directories: [incdir, einfo_incdir, rc_incdir],
-  link_with: [libeinfo, librc],
-  install: true,
-  install_dir: rc_bindir)
+foreach exec : ['mountinfo', 'rc_unmount']
+  executable(exec,
+    ['mountinfo.c', rc_exec_c, timeutils_c, misc_c, usage_c, version_h],
+    c_args : cc_branding_flags,
+    include_directories: [incdir, einfo_incdir, rc_incdir],
+    link_with: [libeinfo, librc],
+    install: true,
+    install_dir: rc_bindir)
+endforeach