From: Michael Biebl <biebl@debian.org>
Date: Sun, 14 Nov 2010 21:14:39 +0000 (+0100)
Subject: Remove umount*.service files for Debian
X-Git-Tag: v12~38
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=761163046260b42c0bed075c17d43e0e6c3dd3a4;p=systemd

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.
---

diff --git a/Makefile.am b/Makefile.am
index e008cc78..f27bed2a 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 )
diff --git a/units/debian/umountfs.service b/units/debian/umountfs.service
deleted file mode 100644
index 1ae58574..00000000
--- a/units/debian/umountfs.service
+++ /dev/null
@@ -1,17 +0,0 @@
-#  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=Turn off swap and umount all local file systems
-DefaultDependencies=no
-Before=reboot.service poweroff.service halt.service umountroot.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/etc/init.d/umountfs stop
-StandardOutput=tty
diff --git a/units/debian/umountnfs.service b/units/debian/umountnfs.service
deleted file mode 100644
index 32f32d10..00000000
--- a/units/debian/umountnfs.service
+++ /dev/null
@@ -1,17 +0,0 @@
-#  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=Umount all network file systems
-DefaultDependencies=no
-Before=reboot.service poweroff.service halt.service umountfs.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/etc/init.d/umountnfs.sh stop
-StandardOutput=tty
diff --git a/units/debian/umountroot.service b/units/debian/umountroot.service
deleted file mode 100644
index 4e0b87d8..00000000
--- a/units/debian/umountroot.service
+++ /dev/null
@@ -1,17 +0,0 @@
-#  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=Mount the root file system read-only
-DefaultDependencies=no
-Before=reboot.service poweroff.service halt.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/etc/init.d/umountroot stop
-StandardOutput=tty