[systemd-commits] 2 commits - Makefile.am units/debian units/multi-user.target.m4

[Lennart Poettering]

 Makefile.am                     |   17 ++++++++++++++++-
 units/debian/umountfs.service   |   18 ++++++++++++++++++
 units/debian/umountnfs.service  |   18 ++++++++++++++++++
 units/debian/umountroot.service |   18 ++++++++++++++++++
 units/multi-user.target.m4      |    4 ++++
 5 files changed, 74 insertions(+), 1 deletion(-)

New commits:
commit e082d6c8d80f3f06d72ae838ee4a1213f108a5e4
Author: Michael Biebl <biebl at debian.org>
Date:   Tue Sep 7 19:58:14 2010 +0200

    units: On Debian Runlevel 2, 3, 4 and 5 are multi-user
    
    Patch by Tollef Fog Heen <tfheen at err.no>
    Extended to re-create the runlevel5.target symlink by Michael Biebl <biebl at debian.org>

diff --git a/Makefile.am b/Makefile.am
index b40aa96..e1fe9e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -972,6 +972,9 @@ if TARGET_DEBIAN
 		$(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 )
 endif
 if !TARGET_SUSE
 if !TARGET_DEBIAN
diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4
index 48c21d2..cf290e7 100644
--- a/units/multi-user.target.m4
+++ b/units/multi-user.target.m4
@@ -20,6 +20,10 @@ Names=runlevel3.target
 m4_ifdef(`TARGET_SUSE',
 Names=runlevel3.target
 )m4_dnl
+m4_ifdef(`TARGET_DEBIAN',
+m4_dnl On Debian Runlevel 2, 3, 4 and 5 are multi-user
+Names=runlevel2.target runlevel3.target runlevel4.target runlevel5.target
+)m4_dnl
 AllowIsolate=yes
 
 [Install]
commit a5dc0a45fefb5ea0b99ae3f0e2cea234aa4e4f9d
Author: Michael Biebl <biebl at debian.org>
Date:   Mon Sep 6 05:44:00 2010 +0200

    units: add umount unit files for Debian
    
    Add unit files to call
    
    /etc/init.d/umountnfs.sh stop (network file systems)
    /etc/init.d/umountfs stop     (local file systems)
    /etc/init.d/umountroot stop   ("/" file system)
    
    in the right order and hook them up in the umount.target so they are run
    on shutdown and reboot.

diff --git a/Makefile.am b/Makefile.am
index 944b871..b40aa96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -236,7 +236,10 @@ dist_systemunit_DATA += \
 	units/debian/killall.service \
 	units/debian/poweroff.service \
 	units/debian/reboot.service \
-	units/debian/fsck.target
+	units/debian/fsck.target \
+	units/debian/umountfs.service \
+	units/debian/umountnfs.service \
+	units/debian/umountroot.service
 endif
 
 if TARGET_SUSE
@@ -961,6 +964,15 @@ if TARGET_GENTOO
 		rm -f xdm.service && \
 		$(LN_S) $(systemunitdir)/xdm.service xdm.service )
 endif
+if TARGET_DEBIAN
+	$(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 )
+endif
 if !TARGET_SUSE
 if !TARGET_DEBIAN
 	( cd $(DESTDIR)$(systemunitdir) && \
diff --git a/units/debian/umountfs.service b/units/debian/umountfs.service
new file mode 100644
index 0000000..804db88
--- /dev/null
+++ b/units/debian/umountfs.service
@@ -0,0 +1,18 @@
+#  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
+After=killall.service
+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
new file mode 100644
index 0000000..598c3d4
--- /dev/null
+++ b/units/debian/umountnfs.service
@@ -0,0 +1,18 @@
+#  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
+After=killall.service
+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
new file mode 100644
index 0000000..5d11602
--- /dev/null
+++ b/units/debian/umountroot.service
@@ -0,0 +1,18 @@
+#  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
+After=killall.service
+Before=reboot.service poweroff.service halt.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/etc/init.d/umountroot stop
+StandardOutput=tty