diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-10-18 22:38:41 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-10-18 22:38:41 +0200 |
| commit | 3b63d2d31d0850bd7a81ab9b468218d2c4c461e8 (patch) | |
| tree | 8c630affc7b088bfa61419b1684a3dd64bb03860 /Makefile.am | |
| parent | 12aad1d075a6cfa23920b977146e79d8154f2540 (diff) | |
tmpfiles: integrate kay's directory cleanup code and otherwise beef up tmpfiles quite a bit
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index f129525f2e..0311302820 100644 --- a/Makefile.am +++ b/Makefile.am @@ -204,9 +204,8 @@ dist_systemunit_DATA = \ units/printer.target \ units/bluetooth.target \ units/smartcard.target \ - units/tmpwatch.service \ - units/tmpwatch.timer \ - units/systemd-readahead-done.timer + units/systemd-readahead-done.timer \ + units/systemd-tmpfiles-clean.timer nodist_systemunit_DATA = \ units/sysinit.target \ @@ -229,7 +228,8 @@ nodist_systemunit_DATA = \ units/systemd-readahead-collect.service \ units/systemd-readahead-replay.service \ units/systemd-readahead-done.service \ - units/systemd-tmpfiles.service \ + units/systemd-tmpfiles-setup.service \ + units/systemd-tmpfiles-clean.service \ units/systemd-user-sessions.service \ units/syslog.target \ units/halt.service \ @@ -266,7 +266,8 @@ EXTRA_DIST = \ units/systemd-readahead-collect.service.in \ units/systemd-readahead-replay.service.in \ units/systemd-readahead-done.service.in \ - units/systemd-tmpfiles.service.in \ + units/systemd-tmpfiles-setup.service.in \ + units/systemd-tmpfiles-clean.service.in \ units/systemd-user-sessions.service.in \ units/syslog.target.in \ units/halt.service.in \ @@ -1093,10 +1094,9 @@ install-data-hook: systemd-vconsole-setup.service \ systemd-modules-load.service \ systemd-random-seed-load.service \ - systemd-tmpfiles.service \ + systemd-tmpfiles-setup.service \ sysctl.service \ - tmpwatch.timer \ - tmpwatch.service && \ + systemd-tmpfiles-clean.timer && \ $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \ $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \ $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \ @@ -1105,10 +1105,9 @@ 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) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \ $(LN_S) ../sysctl.service sysctl.service && \ - $(LN_S) ../tmpwatch.timer tmpwatch.timer && \ - $(LN_S) ../tmpwatch.service tmpwatch.service ) + $(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer ) ( cd $(DESTDIR)$(dbussessionservicedir) && \ rm -f org.freedesktop.systemd1.service && \ $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service ) |