diff options
author | William Hubbs <w.d.hubbs@gmail.com> | 2016-11-14 18:12:06 -0600 |
---|---|---|
committer | William Hubbs <w.d.hubbs@gmail.com> | 2016-12-01 12:04:54 -0600 |
commit | e0ac661419042cb39c1ccf93df2981504d1e6339 (patch) | |
tree | 161d1928820550cb9af2ae47f4da33f9eb97bedf /init.d | |
parent | 6414c3bc394f86a5d6a5f02c934469e21bbbc923 (diff) |
split tmpfiles processing into opentmpfiles
The openntmpfiles package is designed so that it can be used on systems
independently of whether openrc is used.
Diffstat (limited to 'init.d')
-rw-r--r-- | init.d/.gitignore | 2 | ||||
-rw-r--r-- | init.d/Makefile | 6 | ||||
-rw-r--r-- | init.d/tmpfiles.dev.in | 20 | ||||
-rw-r--r-- | init.d/tmpfiles.setup.in | 19 |
4 files changed, 3 insertions, 44 deletions
diff --git a/init.d/.gitignore b/init.d/.gitignore index 98748c7b..b8cbb487 100644 --- a/init.d/.gitignore +++ b/init.d/.gitignore @@ -45,5 +45,3 @@ syslogd termencoding ttys wscons -tmpfiles.dev -tmpfiles.setup diff --git a/init.d/Makefile b/init.d/Makefile index bec4eaf9..75c88adc 100644 --- a/init.d/Makefile +++ b/init.d/Makefile @@ -2,8 +2,8 @@ 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 tmpfiles.setup.in \ - swclock.in sysctl.in runsvdir.in urandom.in s6-svscan.in ${SRCS-${OS}} + netmount.in osclock.in root.in savecache.in swap.in swclock.in \ + sysctl.in runsvdir.in urandom.in s6-svscan.in ${SRCS-${OS}} BIN= ${OBJS} # Are we installing our network scripts? @@ -23,7 +23,7 @@ SRCS-FreeBSD+= adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \ SRCS-Linux= binfmt.in devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \ killprocs.in modules.in modules-load.in mount-ro.in mtab.in numlock.in \ - procfs.in net-online.in sysfs.in termencoding.in tmpfiles.dev.in + procfs.in net-online.in sysfs.in termencoding.in # Generic BSD scripts SRCS-NetBSD= hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \ diff --git a/init.d/tmpfiles.dev.in b/init.d/tmpfiles.dev.in deleted file mode 100644 index c70a29e3..00000000 --- a/init.d/tmpfiles.dev.in +++ /dev/null @@ -1,20 +0,0 @@ -#!@SBINDIR@/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Released under the 2-clause BSD license. - -description="Set up tmpfiles.d entries" - -depend() -{ - use dev-mount - before dev - keyword -prefix -vserver -} - -start() -{ - ebegin "Setting up tmpfiles.d entries for /dev" - @LIBEXECDIR@/sh/tmpfiles.sh --prefix=/dev --create --boot ${tmpfiles_opts} - eend $? - return 0 -} diff --git a/init.d/tmpfiles.setup.in b/init.d/tmpfiles.setup.in deleted file mode 100644 index 5872feaa..00000000 --- a/init.d/tmpfiles.setup.in +++ /dev/null @@ -1,19 +0,0 @@ -#!@SBINDIR@/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Released under the 2-clause BSD license. - -description="Set up tmpfiles.d entries" - -depend() -{ - need localmount -} - -start() -{ - ebegin "Setting up tmpfiles.d entries" - @LIBEXECDIR@/sh/tmpfiles.sh --exclude-prefix=/dev --create --remove --boot \ - ${tmpfiles_opts} - eend $? - return 0 -} |