diff options
| author | Michael Biebl <biebl@debian.org> | 2010-09-03 16:23:05 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-09-06 03:12:44 +0200 |
| commit | f10814d9e00eee75773a0f3cf652236ee1a5fca8 (patch) | |
| tree | 330273f80630a49dfada4207a3d9f4ea8fe47c52 | |
| parent | ad206afcb90368a03fd8373d49a491ef027c7a4a (diff) | |
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.
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | units/debian/fsck.target | 11 | ||||
| -rw-r--r-- | units/sysinit.target.m4 | 4 |
3 files changed, 18 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index ee8ff4028c..944b8718ab 100644 --- 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 index 0000000000..5da9a4ff9d --- /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 029bb3ca31..e8d4d72b87 100644 --- 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 |