Tmpfiles: create and delete entries once in the boot runlevel.
Initially, we were creating tmpfiles entries in the sysinit runlevel and again in the boot runlevel. Systemd runs the --create and --remove options in one service called systemd-tmpfiles-setup after the local file systems are mounted. Now we have a service called tmpfiles.setup which emulates this. This also closes the bug mentioned below, since we were originally writing to files that were on read-only file systems and that were not available. Reported-by: <devurandom@gmx.net> X-Gentoo-Bug: 439012 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=439012
This commit is contained in:
parent
eff07c48b7
commit
1a8cd5ff9d
@ -1,5 +1,5 @@
|
||||
DIR= ${CONFDIR}
|
||||
CONF= bootmisc fsck hostname localmount netmount urandom tmpfilesd \
|
||||
CONF= bootmisc fsck hostname localmount netmount urandom tmpfiles \
|
||||
${CONF-${OS}}
|
||||
|
||||
ifeq (${MKNET},)
|
||||
|
3
init.d/.gitignore
vendored
3
init.d/.gitignore
vendored
@ -41,5 +41,4 @@ syslogd
|
||||
termencoding
|
||||
ttys
|
||||
wscons
|
||||
tmpfilesd.boot
|
||||
tmpfilesd.sysinit
|
||||
tmpfiles.setup
|
||||
|
@ -1,8 +1,7 @@
|
||||
DIR= ${INITDIR}
|
||||
SRCS= bootmisc.in fsck.in hostname.in local.in localmount.in netmount.in \
|
||||
root.in savecache.in swap.in swapfiles.in \
|
||||
tmpfilesd.boot.in tmpfilesd.sysinit.in \
|
||||
swclock.in sysctl.in urandom.in ${SRCS-${OS}}
|
||||
tmpfiles.setup.in swclock.in sysctl.in urandom.in ${SRCS-${OS}}
|
||||
BIN= ${OBJS}
|
||||
|
||||
# Build our old net foo or not
|
||||
|
@ -2,7 +2,7 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Released under the 2-clause BSD license.
|
||||
|
||||
description="Create tmpfiles.d entries (boot)"
|
||||
description="set up tmpfiles.d entries"
|
||||
|
||||
depend()
|
||||
{
|
||||
@ -11,8 +11,8 @@ depend()
|
||||
|
||||
start()
|
||||
{
|
||||
ebegin "Creating ${description#Create }"
|
||||
@LIBEXECDIR@/sh/tmpfiles.sh --create ${tmpfiles_opts}
|
||||
ebegin "setting up tmpfiles.d entries"
|
||||
@LIBEXECDIR@/sh/tmpfiles.sh --create --remove ${tmpfiles_opts}
|
||||
eend $?
|
||||
return 0
|
||||
}
|
@ -1,20 +0,0 @@
|
||||
#!@PREFIX@/sbin/runscript
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Released under the 2-clause BSD license.
|
||||
|
||||
description="Create tmpfiles.d entries (sysinit)"
|
||||
|
||||
depend()
|
||||
{
|
||||
# Convert to 'need dev' when the new udev is ready, for OpenRC 0.11
|
||||
#need dev-mount
|
||||
use dev
|
||||
}
|
||||
|
||||
start()
|
||||
{
|
||||
ebegin "Creating ${description#Create }"
|
||||
@LIBEXECDIR@/sh/tmpfiles.sh --create ${tmpfiles_opts}
|
||||
eend $?
|
||||
return 0
|
||||
}
|
@ -38,9 +38,9 @@ BOOT-FreeBSD+= hostid newsyslog savecore syslogd
|
||||
# FreeBSD specific stuff
|
||||
BOOT-FreeBSD+= adjkerntz dumpon syscons
|
||||
|
||||
BOOT-Linux+= hwclock keymaps modules mtab procfs termencoding tmpfilesd.boot
|
||||
BOOT-Linux+= hwclock keymaps modules mtab procfs termencoding tmpfiles.setup
|
||||
SHUTDOWN-Linux= killprocs mount-ro
|
||||
SYSINIT-Linux= devfs dmesg sysfs tmpfilesd.sysinit
|
||||
SYSINIT-Linux= devfs dmesg sysfs
|
||||
|
||||
# Generic BSD stuff
|
||||
BOOT-NetBSD+= hostid newsyslog savecore syslogd
|
||||
|
Loading…
Reference in New Issue
Block a user