units: Provide separate fsck.target for Debian

On Debian sysinit is not a single script but a separate runlevel.
Split of fsck.target into separate unit file as otherwise we get an
unbreakable cycle on shutdown/reboot.

diff --git a/Makefile.am b/Makefile.am
index ee8ff4028c08c8d3e4179f63549b6e5594339484..944b8718ab051b60fe1ccf97cbc32b2090d6507e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -235,7 +235,8 @@ dist_systemunit_DATA += \
        units/debian/halt.service \
        units/debian/killall.service \
        units/debian/poweroff.service \
-       units/debian/reboot.service
+       units/debian/reboot.service \
+       units/debian/fsck.target
 endif
 
 if TARGET_SUSE
@@ -961,10 +962,12 @@ if TARGET_GENTOO
                $(LN_S) $(systemunitdir)/xdm.service xdm.service )
 endif
 if !TARGET_SUSE
+if !TARGET_DEBIAN
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f fsck.target && \
                $(LN_S) sysinit.target fsck.target )
 endif
+endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \

diff --git a/units/debian/fsck.target b/units/debian/fsck.target
new file mode 100644 (file)
index 0000000..5da9a4f
--- /dev/null
+++ b/units/debian/fsck.target
@@ -0,0 +1,11 @@
+#  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.
+
+# See systemd.special(7) for details
+
+[Unit]
+Description=File System Check

diff --git a/units/sysinit.target.m4 b/units/sysinit.target.m4
index 029bb3ca31021785f75cbf9195294ea42ebf662a..e8d4d72b873316b4c51733065a69a09c7fce6ec3 100644 (file)
--- a/units/sysinit.target.m4
+++ b/units/sysinit.target.m4
@@ -24,6 +24,8 @@ Requires=sysinit.service
 After=sysinit.service
 )m4_dnl
 m4_ifdef(`TARGET_SUSE',`',
-m4_dnl On Suse, fsck.target is seperate, everywhere else it is just an alias for sysinit.target
+m4_ifdef(`TARGET_DEBIAN',`',
+m4_dnl On Suse and Debian fsck.target is separate, everywhere else it is just an alias for sysinit.target
 Names=fsck.target
 )m4_dnl
+)m4_dnl