[gentoo-commits] proj/openrc:master commit in: runlevels/, init.d/

["William Hubbs" <williamh@gentoo.org>]

commit:     35f2f1ec73aa6754764d573ea3e1cce938b3ee9a
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Jul 25 17:33:03 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 18:53:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=35f2f1ec

Introduce the tmpfiles.dev service

This service handles setting up the tmpfiles entries for the /dev
directory for Linux systems which needs to be run in the sysinit
runlevel.

---
 init.d/Makefile                               | 2 +-
 init.d/{tmpfiles.setup.in => tmpfiles.dev.in} | 9 ++++++---
 init.d/tmpfiles.setup.in                      | 3 ++-
 runlevels/Makefile                            | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/init.d/Makefile b/init.d/Makefile
index e7e2d86..fc55b3e 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -28,7 +28,7 @@ SRCS-FreeBSD+=	adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
 NET_LO-Linux=	net.lo
 SRCS-Linux=	devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \
 		killprocs.in modules.in mount-ro.in mtab.in numlock.in \
-		procfs.in sysfs.in termencoding.in
+		procfs.in sysfs.in termencoding.in tmpfiles.dev.in
 
 NET_LO-NetBSD=	net.lo0
 # Generic BSD scripts

diff --git a/init.d/tmpfiles.setup.in b/init.d/tmpfiles.dev.in
similarity index 51%
copy from init.d/tmpfiles.setup.in
copy to init.d/tmpfiles.dev.in
index 81bc369..477fafa 100644
--- a/init.d/tmpfiles.setup.in
+++ b/init.d/tmpfiles.dev.in
@@ -6,13 +6,16 @@ description="set up tmpfiles.d entries"
 
 depend()
 {
-	need localmount
+	use dev-mount
+	before dev
+	keyword -prefix -vserver
 }
 
 start()
 {
-	ebegin "setting up tmpfiles.d entries"
-	@LIBEXECDIR@/sh/tmpfiles.sh --create --remove ${tmpfiles_opts}
+	ebegin "setting up tmpfiles.d entries for /dev"
+	@LIBEXECDIR@/sh/tmpfiles.sh --prefix=/dev --create --remove \
+		${tmpfiles_opts}
 	eend $?
 	return 0
 }

diff --git a/init.d/tmpfiles.setup.in b/init.d/tmpfiles.setup.in
index 81bc369..fd9b015 100644
--- a/init.d/tmpfiles.setup.in
+++ b/init.d/tmpfiles.setup.in
@@ -12,7 +12,8 @@ depend()
 start()
 {
 	ebegin "setting up tmpfiles.d entries"
-	@LIBEXECDIR@/sh/tmpfiles.sh --create --remove ${tmpfiles_opts}
+	@LIBEXECDIR@/sh/tmpfiles.sh --exclude-prefix=/dev --create --remove \
+		${tmpfiles_opts}
 	eend $?
 	return 0
 }

diff --git a/runlevels/Makefile b/runlevels/Makefile
index 6eb84ca..f691113 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -40,7 +40,7 @@ BOOT-FreeBSD+=	adjkerntz dumpon syscons
 
 BOOT-Linux+=	hwclock keymaps modules mtab procfs termencoding tmpfiles.setup
 SHUTDOWN-Linux=	killprocs mount-ro
-SYSINIT-Linux=	devfs dmesg sysfs
+SYSINIT-Linux=	devfs dmesg sysfs tmpfiles.dev
 
 # Generic BSD stuff
 BOOT-NetBSD+=	hostid newsyslog savecore syslogd