Remove references to localmountorigin/mount-servicegithub/mount-service

Convert all references to localmount to the specific file systems that
should be needed.

37 files changed, 39 insertions, 39 deletions

diff --git a/init.d.misc/avahi-dnsconfd.in b/init.d.misc/avahi-dnsconfd.in
index 5e022a1b..10e771de 100644
--- a/init.d.misc/avahi-dnsconfd.in
+++ b/init.d.misc/avahi-dnsconfd.in
@@ -10,6 +10,6 @@ name="Avahi DNS Configuration Daemon"
 depend()
 {
 	use dns
-	need localmount dbus
+	need mount.usr mount.var dbus
 	after bootmisc
 }
diff --git a/init.d.misc/avahid.in b/init.d.misc/avahid.in
index bc8ce15b..4230cd2d 100644
--- a/init.d.misc/avahid.in
+++ b/init.d.misc/avahid.in
@@ -10,6 +10,6 @@ name="Avahi Service Advertisement Daemon"
 depend()
 {
 	use dns
-	need localmount dbus
+	need mount.usr mount.var dbus
 	after bootmisc
 }
diff --git a/init.d.misc/dbus.in b/init.d.misc/dbus.in
index 52598534..1bfb3354 100644
--- a/init.d.misc/dbus.in
+++ b/init.d.misc/dbus.in
@@ -9,7 +9,7 @@ name="Message Bus Daemon"
 
 depend()
 {
-	need localmount net
+	need mount.usr mount.var net
 	after bootmisc
 }
 
diff --git a/init.d.misc/dhcpcd.in b/init.d.misc/dhcpcd.in
index ff71979f..4048eabe 100644
--- a/init.d.misc/dhcpcd.in
+++ b/init.d.misc/dhcpcd.in
@@ -10,7 +10,7 @@ name="DHCP Client Daemon"
 depend()
 {
 	provide net
-	need localmount
+	need mount.usr mount.var
 	use logger
 	after bootmisc modules
 	before dns
diff --git a/init.d.misc/dnsmasq.in b/init.d.misc/dnsmasq.in
index fa57164b..6216295f 100644
--- a/init.d.misc/dnsmasq.in
+++ b/init.d.misc/dnsmasq.in
@@ -12,7 +12,7 @@ extra_started_commands="reload"
 depend()
 {
 	provide dns
-	need localmount net
+	need mount.usr mount.var net
 	after bootmisc
 }
 
diff --git a/init.d.misc/named.in b/init.d.misc/named.in
index 3f558849..82e7ce8d 100644
--- a/init.d.misc/named.in
+++ b/init.d.misc/named.in
@@ -24,7 +24,7 @@ esac
 depend()
 {
 	provide dns
-	need localmount
+	need mount.usr mount.var
 	after bootmisc
 }
 
diff --git a/init.d.misc/ntpd.in b/init.d.misc/ntpd.in
index 080ce2f6..2049e2ac 100644
--- a/init.d.misc/ntpd.in
+++ b/init.d.misc/ntpd.in
@@ -14,7 +14,7 @@ name="Network Time Protocol Daemon"
 depend()
 {
 	use dns
-	need localmount
+	need mount.usr mount.var
 	after bootmisc ntp-client
 }
 
diff --git a/init.d.misc/openvpn.in b/init.d.misc/openvpn.in
index 32379466..adc26e47 100644
--- a/init.d.misc/openvpn.in
+++ b/init.d.misc/openvpn.in
@@ -31,7 +31,7 @@ fi
 
 depend()
 {
-	need localmount net
+	need mount.usr mount.var net
 	use dns
 	after bootmisc
 }
diff --git a/init.d.misc/wpa_supplicant.in b/init.d.misc/wpa_supplicant.in
index d9246123..87b7a452 100644
--- a/init.d.misc/wpa_supplicant.in
+++ b/init.d.misc/wpa_supplicant.in
@@ -10,7 +10,7 @@ name="WPA Supplicant Daemon"
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	use logger
 	after bootmisc modules
 	before dns dhcpcd net
diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 13f23891..3180e951 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -4,7 +4,7 @@
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	before logger
 	after clock root sysctl
 	keyword -prefix -timeout
diff --git a/init.d/consolefont.in b/init.d/consolefont.in
index e56cc095..d62065e1 100644
--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -6,7 +6,7 @@ description="Sets a font for the consoles."
 
 depend()
 {
-	need localmount termencoding
+	need mount.usr mount.var termencoding
 	after hotplug bootmisc
 	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
 }
diff --git a/init.d/devd.in b/init.d/devd.in
index d071911c..02bb1ee8 100644
--- a/init.d/devd.in
+++ b/init.d/devd.in
@@ -7,7 +7,7 @@ command_args=$devd_args
 name="Device State Change Daemon"
 
 depend() {
-	need localmount
+	need mount.usr mount.var
 	after bootmisc
 	before net.lo0
 	keyword -jail -prefix
diff --git a/init.d/devdb.in b/init.d/devdb.in
index 3cc08a59..bb883634 100644
--- a/init.d/devdb.in
+++ b/init.d/devdb.in
@@ -6,7 +6,7 @@ description="Creates the dev database"
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 }
 
 start()
diff --git a/init.d/keymaps.in b/init.d/keymaps.in
index af424856..b9cdee92 100644
--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -6,7 +6,7 @@ description="Applies a keymap for the consoles."
 
 depend()
 {
-	need localmount termencoding
+	need mount.usr mount.var termencoding
 	after bootmisc
 	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
 }
diff --git a/init.d/mixer.in b/init.d/mixer.in
index 8bf152b1..e0b8c325 100644
--- a/init.d/mixer.in
+++ b/init.d/mixer.in
@@ -6,7 +6,7 @@ extra_commands="restore"
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	keyword -jail -prefix
 }
 
diff --git a/init.d/moused.in b/init.d/moused.in
index 2b63a346..a2fb71d2 100644
--- a/init.d/moused.in
+++ b/init.d/moused.in
@@ -14,7 +14,7 @@ name="Console Mouse Daemon"
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	after bootmisc
 	keyword -jail -prefix
 }
diff --git a/init.d/network.in b/init.d/network.in
index 2e9b8974..f0a75aba 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -10,7 +10,7 @@ __nl="
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	after bootmisc
 	if [ -n "$(interfaces)" ]; then
 		provide net
diff --git a/init.d/newsyslog.in b/init.d/newsyslog.in
index 894b0c07..1a1f5762 100644
--- a/init.d/newsyslog.in
+++ b/init.d/newsyslog.in
@@ -6,7 +6,7 @@ required_files="/etc/newsyslog.conf"
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	keyword -prefix
 }
 
diff --git a/init.d/nscd.in b/init.d/nscd.in
index 670f2066..0d877c07 100644
--- a/init.d/nscd.in
+++ b/init.d/nscd.in
@@ -10,7 +10,7 @@ name="Name Service Cache Daemon"
 extra_started_commands="flush"
 
 depend() {
-	need localmount
+	need mount.usr mount.var
 	use net dns ldap ypbind
 	after bootmisc
 }
diff --git a/init.d/numlock.in b/init.d/numlock.in
index cdc0da01..ba659652 100644
--- a/init.d/numlock.in
+++ b/init.d/numlock.in
@@ -8,7 +8,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 
diff --git a/init.d/pf.in b/init.d/pf.in
index f4344a93..6d0b2199 100644
--- a/init.d/pf.in
+++ b/init.d/pf.in
@@ -10,7 +10,7 @@ extra_commands="checkconfig showstatus"
 extra_started_commands="reload"
 
 depend() {
-	need localmount
+	need mount.usr mount.var
 	keyword -jail -prefix
 }
 
diff --git a/init.d/powerd.in b/init.d/powerd.in
index 36d60a7e..2776d927 100644
--- a/init.d/powerd.in
+++ b/init.d/powerd.in
@@ -9,7 +9,7 @@ name="Power Control Daemon"
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	use logger
 	after bootmisc
 	keyword -jail -prefix
diff --git a/init.d/procfs.in b/init.d/procfs.in
index a9fcb9a2..63e2b58d 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -7,7 +7,7 @@ description="Mounts misc filesystems in /proc."
 depend()
 {
 	use modules devfs
-	need localmount
+	need mount.usr mount.var
 	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 
diff --git a/init.d/rarpd.in b/init.d/rarpd.in
index e11de6d2..92e10883 100644
--- a/init.d/rarpd.in
+++ b/init.d/rarpd.in
@@ -17,7 +17,7 @@ command_background=YES
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	after bootmisc
 	need net
 }
diff --git a/init.d/rc-enabled.in b/init.d/rc-enabled.in
index 50587bce..2fc922d4 100644
--- a/init.d/rc-enabled.in
+++ b/init.d/rc-enabled.in
@@ -4,7 +4,7 @@
 
 depend()
 {
-	need localmount net
+	need mount.usr mount.var net
 	after *
 	before local
 	keyword -prefix
diff --git a/init.d/rpcbind.in b/init.d/rpcbind.in
index c10deeb1..25ddf4dd 100644
--- a/init.d/rpcbind.in
+++ b/init.d/rpcbind.in
@@ -9,7 +9,7 @@ name="RPC program number mapper"
 depend()
 {
 	provide rpc
-	need localmount
+	need mount.usr mount.var
 	use net logger dns
 	before inetd xinetd ntpd ntp-client
 }
diff --git a/init.d/s6-svscan.in b/init.d/s6-svscan.in
index 6fdf4e1d..70126b15 100644
--- a/init.d/s6-svscan.in
+++ b/init.d/s6-svscan.in
@@ -9,7 +9,7 @@ pidfile=/var/run/s6-svscan.pid
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 }
 
 start_pre()
diff --git a/init.d/savecore.in b/init.d/savecore.in
index cb005643..52e1ee38 100644
--- a/init.d/savecore.in
+++ b/init.d/savecore.in
@@ -6,7 +6,7 @@ description="Saves a kernel dump."
 
 depend()
 {
-	need dumpon localmount
+	need dumpon mount.usr mount.var
 	before encswap
 	keyword -jail -prefix
 }
diff --git a/init.d/swap.in b/init.d/swap.in
index 41d4eac8..fc22c55b 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -4,7 +4,7 @@
 
 depend()
 {
-	before localmount
+	before mount.usr mount.var
 	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 
diff --git a/init.d/swapfiles.in b/init.d/swapfiles.in
index 5c807626..c3a2a774 100644
--- a/init.d/swapfiles.in
+++ b/init.d/swapfiles.in
@@ -4,7 +4,7 @@
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 
diff --git a/init.d/syscons.in b/init.d/syscons.in
index ce0b5a13..8ff28776 100644
--- a/init.d/syscons.in
+++ b/init.d/syscons.in
@@ -3,7 +3,7 @@
 # Released under the 2-clause BSD license.
 
 depend() {
-	need localmount
+	need mount.usr mount.var
 	keyword -jail -prefix
 }
 
diff --git a/init.d/syslogd.in b/init.d/syslogd.in
index 953742bf..2f6c040e 100644
--- a/init.d/syslogd.in
+++ b/init.d/syslogd.in
@@ -14,7 +14,7 @@ depend()
 {
 	provide logger
 	use net newsyslog
-	need localmount
+	need mount.usr mount.var
 	after bootmisc
 	keyword -prefix
 }
diff --git a/init.d/tmpfiles.setup.in b/init.d/tmpfiles.setup.in
index 5872feaa..9be06a87 100644
--- a/init.d/tmpfiles.setup.in
+++ b/init.d/tmpfiles.setup.in
@@ -6,7 +6,7 @@ description="Set up tmpfiles.d entries"
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 }
 
 start()
diff --git a/init.d/urandom.in b/init.d/urandom.in
index 0dd2ba65..e5c16e34 100644
--- a/init.d/urandom.in
+++ b/init.d/urandom.in
@@ -7,7 +7,7 @@ description="Initializes the random number generator."
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	keyword -jail -lxc -openvz -prefix -systemd-nspawn
 }
 
diff --git a/init.d/wscons.in b/init.d/wscons.in
index 84671224..5f39fd92 100644
--- a/init.d/wscons.in
+++ b/init.d/wscons.in
@@ -4,7 +4,7 @@
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	keyword -prefix
 }
 
diff --git a/man/openrc-run.8 b/man/openrc-run.8
index 4637fd03..5cf78c92 100644
--- a/man/openrc-run.8
+++ b/man/openrc-run.8
@@ -487,8 +487,8 @@ _need_dbus()
 
 depend()
 {
-    # We write a pidfile and to /var/cache, so we need localmount.
-    need localmount
+    # We write a pidfile and to /var/cache, so we need mount.var.
+    need mount.var
     # We can optionally use the network, but it's not essential.
     use net
     # We should be after bootmisc so that /var/run is cleaned before
diff --git a/src/rc/openrc-run.c b/src/rc/openrc-run.c
index 989779bb..6e7b7e76 100644
--- a/src/rc/openrc-run.c
+++ b/src/rc/openrc-run.c
@@ -939,9 +939,9 @@ svc_stop_real(void)
 {
 	bool stopped;
 
-	/* If we're stopping localmount, set LC_ALL=C so that
+	/* If we're stopping mount.*, set LC_ALL=C so that
 	 * bash doesn't load anything blocking the unmounting of /usr */
-	if (strcmp(applet, "localmount") == 0)
+	if (strncmp(applet, "mount.", 6) == 0)
 		setenv("LC_ALL", "C", 1);
 
 	if (ibsave)