diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-09-29 01:39:09 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-09-29 01:39:31 +0200 |
| commit | 93ca9714e6afa0adc2aa674e2505ca97ca5b91c9 (patch) | |
| tree | 8880c5fa008dcae288bcc990a5e405c02ba6ccd6 /Makefile.am | |
| parent | afbf835326b0cc05c282b43f14ed501977de2004 (diff) | |
units: get rid of special setup services for /var/run, /var/lock and /tmp, and rely on tmpfiles.d/ instead
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index fd163c8f1e..b3ab55065a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -181,11 +181,8 @@ dist_systemunit_DATA = \ units/sys-kernel-security.automount \ units/sys-kernel-security.mount \ units/tmp.mount \ - units/tmp.service \ units/var-lock.mount \ - units/var-lock.service \ units/var-run.mount \ - units/var-run.service \ units/hwclock-load.service \ units/hwclock-save.service \ units/sysctl.service \ @@ -1003,15 +1000,11 @@ install-data-hook: rm -f systemd-remount-api-vfs.service \ remount-rootfs.service \ var-run.mount \ - var-run.service \ - var-lock.mount \ - var-lock.service && \ + var-lock.mount && \ $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \ $(LN_S) ../remount-rootfs.service remount-rootfs.service && \ $(LN_S) ../var-run.mount var-run.mount && \ - $(LN_S) ../var-run.service var-run.service && \ - $(LN_S) ../var-lock.mount var-lock.mount && \ - $(LN_S) ../var-lock.service var-lock.service ) + $(LN_S) ../var-lock.mount var-lock.mount ) ( cd $(DESTDIR)$(sessionunitdir) && \ rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \ $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \ @@ -1160,7 +1153,5 @@ git-tag: # Opt out from a few services on Fedora for now, as long as rc.sysinit does this job fedora: install - rm /lib/systemd/system/local-fs.target.wants/var-run.service rm /lib/systemd/system/local-fs.target.wants/var-run.mount - rm /lib/systemd/system/local-fs.target.wants/var-lock.service rm /lib/systemd/system/local-fs.target.wants/var-lock.mount |