summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2010-11-14 22:14:39 +0100
committerMichael Biebl <biebl@debian.org>2010-11-14 22:14:39 +0100
commit761163046260b42c0bed075c17d43e0e6c3dd3a4 (patch)
tree4dda9dbe80413b8beb89ff4066d1a955eb018151 /Makefile.am
parent9c73736da85110ca73d141b5acff6f4989092c07 (diff)
Remove umount*.service files for Debian
With the introduction of native shutdown/reboot, the killall.service was removed (as this functionality was moved into systemd-shutdown). Without killall.service though, the umount*.service files no longer work correctly. Wit native mount support those files are also no longer necessary, so remove them.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am14
1 files changed, 0 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index e008cc78d8..f27bed2a1f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -328,13 +328,6 @@ dist_systemunit_DATA += \
units/fedora/plymouth-halt.service
endif
-if TARGET_DEBIAN_OR_UBUNTU
-dist_systemunit_DATA += \
- units/debian/umountfs.service \
- units/debian/umountnfs.service \
- units/debian/umountroot.service
-endif
-
if TARGET_GENTOO
dist_systemunit_DATA += \
units/gentoo/xdm.service
@@ -1294,13 +1287,6 @@ if TARGET_GENTOO
$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
if TARGET_DEBIAN_OR_UBUNTU
- $(MKDIR_P) -m 0755 \
- $(DESTDIR)$(systemunitdir)/umount.target.wants
- ( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
- rm -f umountfs.service umountnfs.service umountroot.service && \
- $(LN_S) ../umountfs.service umountfs.service && \
- $(LN_S) ../umountnfs.service umountnfs.service && \
- $(LN_S) ../umountroot.service umountroot.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f runlevel5.target && \
$(LN_S) multi-user.target runlevel5.target )