label: if the selinux policy knows no label, then silently don't do anything

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b15cb123bef3e444fcda02a48910b057cbe33324..0311302820cfe565ee4fe399526ed7cfd31001c4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -174,6 +174,7 @@ dist_systemunit_DATA = \
        units/rpcbind.target \
        units/rtc-set.target \
        units/shutdown.target \
+       units/final.target \
        units/umount.target \
        units/sigpwr.target \
        units/sockets.target \
@@ -203,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 \
@@ -228,9 +228,13 @@ 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 \
+       units/poweroff.service \
+       units/reboot.service \
        units/kexec.service
 
 dist_sessionunit_DATA = \
@@ -262,21 +266,22 @@ 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 \
+       units/poweroff.service.in \
+       units/reboot.service.in \
        units/kexec.service.in \
        units/session/exit.service.in \
        systemd.pc.in
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
-       units/fedora/halt.service \
-       units/fedora/killall.service \
-       units/fedora/poweroff.service \
        units/fedora/prefdm.service \
        units/fedora/rc-local.service \
-       units/fedora/reboot.service \
+       units/fedora/halt-local.service \
        units/fedora/sysinit.service \
        units/fedora/single.service \
        units/fedora/plymouth-quit.service \
@@ -287,10 +292,6 @@ endif
 
 if TARGET_DEBIAN
 dist_systemunit_DATA += \
-       units/debian/halt.service \
-       units/debian/killall.service \
-       units/debian/poweroff.service \
-       units/debian/reboot.service \
        units/debian/fsck.target \
        units/debian/umountfs.service \
        units/debian/umountnfs.service \
@@ -299,28 +300,18 @@ endif
 
 if TARGET_SUSE
 dist_systemunit_DATA += \
-       units/suse/halt.service \
-       units/suse/poweroff.service \
-       units/suse/reboot.service \
        units/suse/fsck.target
 endif
 
 if TARGET_GENTOO
 dist_systemunit_DATA += \
-       units/gentoo/halt.service \
-       units/gentoo/killall.service \
-       units/gentoo/poweroff.service \
-       units/gentoo/reboot.service \
        units/gentoo/xdm.service
 endif
 
 if TARGET_ARCH
 dist_systemunit_DATA += \
        units/arch/sysinit.service \
-       units/arch/rc-local.service \
-       units/arch/halt.service \
-       units/arch/poweroff.service \
-       units/arch/reboot.service
+       units/arch/rc-local.service
 endif
 
 dist_doc_DATA = \
@@ -1103,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 && \
@@ -1115,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 )
@@ -1129,7 +1118,8 @@ if TARGET_FEDORA
                $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
                $(DESTDIR)$(systemunitdir)/halt.target.wants \
                $(DESTDIR)$(systemunitdir)/rescue.target.wants \
-               $(DESTDIR)$(systemunitdir)/multi-user.target.wants
+               $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
+               $(DESTDIR)$(systemunitdir)/final.target.wants
        ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
@@ -1139,6 +1129,9 @@ if TARGET_FEDORA
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f rc-local.service && \
                $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+       ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+               rm -f halt-local.service && \
+               $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
        ( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
                rm -f single.service && \
                $(LN_S) $(systemunitdir)/single.service single.service )