Remove references to localmount

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

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.17
+VERSION=	0.18
 PKG=		${NAME}-${VERSION}

conf.d/Makefile

@@ -1,7 +1,7 @@
 include ../mk/net.mk
 
 DIR=	${CONFDIR}
-CONF=	bootmisc fsck hostname localmount netmount urandom tmpfiles \
+CONF=	bootmisc fsck hostname localmount mount netmount urandom tmpfiles \
 		${CONF-${OS}}
 
 ifeq (${MKNET},yes)

conf.d/mount

@@ -0,0 +1,23 @@
+# The mount service is a multiplexed service. This means you must have
+# symbolic links to it in your init.d directory for each file system you
+# want to mount. I recommend naming those symbolic links the same as the
+# paths to the file systems they mount, removing the leading slash and
+# substituting _ for the remaining slashes, for example:
+#
+# cd /etc/init.d
+# ln -s mount mount.usr
+# ln -s mount mount.usr_local
+#
+# Set up a symbolic link like this for each file system you wish to
+# mount, then add the symbolic link to the appropriate runlevel. Once
+# that is done, add the appropriate definitions for the file system to
+# this file.
+#
+#You will need to define the mountpoint and any dependencies for each
+#filesystem as shown here.
+#
+#If the mountpoint does not match an entry in fstab, the mount will be
+#ignored.
+#
+#mount_usr_mountpoint="/usr"
+#

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
 }

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
 }

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
 }
 

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

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
 }
 

init.d.misc/named.in

@@ -24,7 +24,7 @@ esac
 depend()
 {
 	provide dns
-	need localmount
+	need mount.usr mount.var
 	after bootmisc
 }
 

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
 }
 

init.d.misc/openvpn.in

@@ -31,7 +31,7 @@ fi
 
 depend()
 {
-	need localmount net
+	need mount.usr mount.var net
 	use dns
 	after bootmisc
 }

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

init.d/.gitignore

@@ -4,6 +4,7 @@ hostname
 local
 localmount
 loopback
+mount
 moused
 netmount
 network

init.d/Makefile

@@ -2,7 +2,7 @@ include ../mk/net.mk
 
 DIR=	${INITDIR}
 SRCS=	bootmisc.in fsck.in hostname.in local.in localmount.in loopback.in \
-	netmount.in osclock.in root.in savecache.in swap.in swapfiles.in \
+	mount.in netmount.in osclock.in root.in savecache.in swap.in swapfiles.in \
 	tmpfiles.setup.in swclock.in sysctl.in urandom.in s6-svscan.in ${SRCS-${OS}}
 BIN=	${OBJS}
 

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

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
 }

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

init.d/devdb.in

@@ -6,7 +6,7 @@ description="Creates the dev database"
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 }
 
 start()

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
 }

init.d/mixer.in

@@ -6,7 +6,7 @@ extra_commands="restore"
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	keyword -jail -prefix
 }
 

init.d/mount.in

@@ -0,0 +1,118 @@
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2015 William Hubbs <w.d.hubbs@gmail.com>
+# Released under the 2-clause BSD license.
+
+description="Mount a file system defined in @SYSCONFDIR@/fstab"
+extra_commands="generate"
+
+depend()
+{
+	need fsck
+	use modules mtab
+	after modules
+	keyword -jail -prefix -vserver -lxc
+}
+
+. "$RC_LIBEXECDIR"/sh/rc-mount.sh
+
+start_pre()
+{
+	# Do not start this service as "mount"
+	if [ "$rc_svcname" = mount ]; then
+		eerror "The mount service should not be started directly"
+		return 1
+	fi
+	return 0
+}
+
+start()
+{
+	if [ "$rc_svcname" = mount-generate-symlinks ]; then
+		generate
+		return $?
+	fi
+
+	local mountname=${rc_svcname#*.}
+	local fspath=${mount_${mountname}_mountpoint}
+
+	# for now, make sure fspath is in fstab
+	if [ ! fstabinfo -q $fspath ]; then
+		einfo "$rc_svcname: $fspath is not in @SYSCONFDIR@/fstab"
+		return 0
+	fi
+
+	# Is the file system mounted?
+	if mountinfo -q $fspath; then
+		action=remount
+		msg=Remounting
+	else
+		action=mount
+		msg=Mounting
+	fi
+
+	ebegin "$msg $fspath according to @SYSCONFDIR@/fstab"
+	fstabinfo --$action $fspath
+	eend $? "$fspath failed to $action"
+}
+
+stop_pre()
+{
+	# Do not stop this service as "mount"
+	if [ "$rc_svcname" = mount ]; then
+		eerror "The mount service should not be stopped directly"
+		return 1
+	fi
+	return 0
+}
+
+stop()
+{
+	yesno $RC_GOINGDOWN || return 0
+	local mountname=${rc_svcname#*.}
+	local fspath=${mount_${mountname}_mountpoint}
+
+	# make sure fspath is in fstab
+	if ! fstabinfo -q $fspath; then
+		einfo "$rc_svcname: $fspath is not in @SYSCONFDIR@/fstab"
+		return 0
+	fi
+
+	# Is the file system mounted?
+	mountinfo -q $fspath || return 0
+
+	# Flush all pending disk writes now
+	sync
+
+	ebegin "Unmounting $fspath"
+	do_unmount umount $fspath
+	eend $? "Unable to umount $fspath"
+	return 0
+}
+
+generate()
+{
+	local fslist="$(fstabinfo)"
+	local fs fsopts rc=0
+	local svcpath=${RC_SVCNAME%/*}
+	ebegin "Generating mount symlinks"
+	for fs in $fslist; do
+		case $fs in
+		/) ;;
+		/*)
+			fsopts="$(fstabinfo -o $fs)"
+			case "$fsopts" in
+			*noauto*) ;;
+			*)
+				local name="${fs#/}"
+				name="$(echo $name | sed 's#/#.#g')"
+				einfo ln -snf mount "${svcpath}/${name}"
+				rc=$?
+				[ $rc -ne 0 ] && break
+			*) ;;
+			esac
+		*) ;;
+		esac
+	done
+	eend $rc "Failed to generate symlinks for all mounts"
+	return $rc
+}

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
 }

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

init.d/newsyslog.in

@@ -6,7 +6,7 @@ required_files="/etc/newsyslog.conf"
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	keyword -prefix
 }
 

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
 }

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
 }
 

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
 }
 

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

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
 }
 

init.d/rarpd.in

@@ -17,7 +17,7 @@ command_background=YES
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	after bootmisc
 	need net
 }

init.d/rc-enabled.in

@@ -4,7 +4,7 @@
 
 depend()
 {
-	need localmount net
+	need mount.usr mount.var net
 	after *
 	before local
 	keyword -prefix

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
 }

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()

init.d/savecache.in

@@ -30,7 +30,7 @@ start()
 			if yesno "${RC_GOINGDOWN}"; then
 				rc=0
 			fi
-			eend $rc "Unable to create $RC_SVCDIR/cache"
+			eend $rc "Unable to create $RC_LIBEXECDIR/cache"
 			return $rc
 		fi
 	fi

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
 }

init.d/swap.in

@@ -4,7 +4,7 @@
 
 depend()
 {
-	before localmount
+	before mount.usr mount.var
 	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 

init.d/swapfiles.in

@@ -4,7 +4,7 @@
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
 }
 

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
 }
 

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
 }

init.d/tmpfiles.setup.in

@@ -6,7 +6,7 @@ description="Set up tmpfiles.d entries"
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 }
 
 start()

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
 }
 

init.d/wscons.in

@@ -4,7 +4,7 @@
 
 depend()
 {
-	need localmount
+	need mount.usr mount.var
 	keyword -prefix
 }
 

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

mount-service.md

@@ -0,0 +1,46 @@
+# New Mount Service
+
+This is definitely considered testing code, so if you use it on your
+system and it breaks, you have been warned.
+
+This document will evolve as the testing proceeds and will be removed
+once the script goes mainline.
+
+Since this is on a topic branch, this branch will be subject to
+rebasing, merging commits, etc. When it goes to master, everything here
+will be in one commit.
+
+The goal of this is to replace the localmount and metmount services with
+a single mount service which will be multiplexed so that there is one
+service for each file system that will be mounted.
+
+- rc-service mount generate
+
+scans your fstab and attempts to generate symbolic links in /etc/init.d
+for each file system you want to mount.
+
+Then you must edit /etc/conf.d/mount to list all of your file systems
+and the dependencies they have by using
+rc_mount_foo_before/after/need/use settings.
+
+rc-service mount.foo start
+
+tries to mount a file system and
+
+rc-service mount.foo stop
+
+tries to unmount it if your system is going down.
+
+I'm considering automating the generation of symlinks into the boot
+process, but I'm not sure yet whether this is a good idea.
+
+I haven't decided yet exactly how I want to handle the transition from
+localmount/netmount to this new mount service yet, so you will
+definitely not have a clean boot if you try to boot with this.
+
+Another question is whether I want to try automating adding the mount
+services to runlevels; I think no, but let me know if you feel
+differently.
+
+Any suggestions would be helpful.
+

sh/tmpfiles.sh.in

@@ -141,6 +141,13 @@ _D() {
 	fi
 }
 
+_v() {
+	# Create a subvolume if the path does not exist yet and the file system
+	# supports this (btrfs). Otherwise create a normal directory.
+	# TODO: Implement btrfs subvol creation.
+	_d "$@"
+}
+
 _L() {
 	# Create a symlink if it doesn't exist yet
 	local path=$1 mode=$2 uid=$3 gid=$4 age=$5 arg=$6
@@ -336,7 +343,7 @@ for FILE in $tmpfiles_d ; do
 
 		# whine about invalid entries
 		case $cmd in
-			f|F|w|d|D|p|L|c|C|b|x|X|r|R|z|Z) ;;
+			f|F|w|d|D|v|p|L|c|C|b|x|X|r|R|z|Z) ;;
 			*) warninvalid ; continue ;;
 		esac
 
@@ -344,7 +351,7 @@ for FILE in $tmpfiles_d ; do
 		if [ "$mode" = '-' -o "$mode" = '' ]; then
 			case "$cmd" in
 				p|f|F) mode=0644 ;;
-				d|D) mode=0755 ;;
+				d|D|v) mode=0755 ;;
 				C|z|Z|x|r|R|L) ;;
 			esac
 		fi

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)

src/rc/rc-misc.c

@@ -66,6 +66,7 @@ static const char *const env_whitelist[] = {
 	"LC_MONETARY", "LC_MESSAGES", "LC_PAPER", "LC_NAME", "LC_ADDRESS",
 	"LC_TELEPHONE", "LC_MEASUREMENT", "LC_IDENTIFICATION", "LC_ALL",
 	"IN_HOTPLUG", "IN_BACKGROUND", "RC_INTERFACE_KEEP_CONFIG",
+	"EERROR_QUIET", "EINFO_QUIET",
 	NULL
 };