diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | fixme | 2 | ||||
| -rw-r--r-- | units/.gitignore | 1 | ||||
| -rw-r--r-- | units/systemd-random-seed-load.service.in | 3 | ||||
| -rw-r--r-- | units/systemd-tmpfiles.service.in | 18 |
5 files changed, 26 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 973d341ea3..fd163c8f1e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -216,6 +216,7 @@ nodist_systemunit_DATA = \ units/systemd-random-seed-load.service \ units/systemd-readahead-collect.service \ units/systemd-readahead-replay.service \ + units/systemd-tmpfiles.service \ units/syslog.target dist_sessionunit_DATA = \ @@ -245,6 +246,7 @@ EXTRA_DIST = \ units/systemd-random-seed-load.service.in \ units/systemd-readahead-collect.service.in \ units/systemd-readahead-replay.service.in \ + units/systemd-tmpfiles.service.in \ units/syslog.target.in \ units/session/exit.service.in \ systemd.pc.in @@ -1054,6 +1056,7 @@ install-data-hook: systemd-vconsole-setup.service \ systemd-modules-load.service \ systemd-random-seed-load.service \ + systemd-tmpfiles.service \ sysctl.service \ tmpwatch.timer \ tmpwatch.service && \ @@ -1065,6 +1068,7 @@ install-data-hook: $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \ $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \ $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \ + $(LN_S) ../systemd-tmpfiles.service systemd-tmpfiles.service && \ $(LN_S) ../sysctl.service sysctl.service && \ $(LN_S) ../tmpwatch.timer tmpwatch.timer && \ $(LN_S) ../tmpwatch.service tmpwatch.service ) @@ -105,6 +105,8 @@ later: * when /proc/self/mountinfo is not parsable, proceed with next line +* beefed up tmpwatch that reads tmpfiles.d + External: * place /etc/inittab with explaining blurb. diff --git a/units/.gitignore b/units/.gitignore index 1ae1f96b11..1b5b12256d 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -1,3 +1,4 @@ +systemd-tmpfiles.service systemd-readahead-collect.service systemd-readahead-replay.service serial-getty@.service diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in index d03f9b841b..b103f52007 100644 --- a/units/systemd-random-seed-load.service.in +++ b/units/systemd-random-seed-load.service.in @@ -9,9 +9,8 @@ Description=Load Random Seed DefaultDependencies=no Wants=local-fs.target -After=local-fs.target Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service +After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target Before=shutdown.target [Service] diff --git a/units/systemd-tmpfiles.service.in b/units/systemd-tmpfiles.service.in new file mode 100644 index 0000000000..f869195180 --- /dev/null +++ b/units/systemd-tmpfiles.service.in @@ -0,0 +1,18 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +[Unit] +Description=Recreate Volatile Files and Directories +DefaultDependencies=no +Wants=local-fs.target +After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target +Before=shutdown.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=@rootlibexecdir@/systemd-tmpfiles |