summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-10-19 23:45:18 +0200
committerLennart Poettering <lennart@poettering.net>2010-10-19 23:45:18 +0200
commita9e1f5ec36049dca715f83b2c6fc44a019e2da53 (patch)
tree699d23b240c6572870e3184910503131078f4f4b /units
parent90bb85e140a238ce76f05c473e2eb68f147671f3 (diff)
fsck: properly hook in fsck everywhere, add special support for fsck'ing root dir
Diffstat (limited to 'units')
-rw-r--r--units/remount-rootfs.service2
-rw-r--r--units/sysinit.target.m46
-rw-r--r--units/systemd-update-utmp-runlevel.service.in2
3 files changed, 2 insertions, 8 deletions
diff --git a/units/remount-rootfs.service b/units/remount-rootfs.service
index 31deb82db3..890f8fbca1 100644
--- a/units/remount-rootfs.service
+++ b/units/remount-rootfs.service
@@ -9,7 +9,7 @@
Description=Remount Root FS
DefaultDependencies=no
Conflicts=shutdown.target
-After=systemd-readahead-collect.service systemd-readahead-replay.service fsck.target
+After=systemd-readahead-collect.service systemd-readahead-replay.service
Before=local-fs.target shutdown.target
[Service]
diff --git a/units/sysinit.target.m4 b/units/sysinit.target.m4
index e8d4d72b87..08b035da24 100644
--- a/units/sysinit.target.m4
+++ b/units/sysinit.target.m4
@@ -23,9 +23,3 @@ m4_dnl Hook in Arch's /etc/rc.sysinit
Requires=sysinit.service
After=sysinit.service
)m4_dnl
-m4_ifdef(`TARGET_SUSE',`',
-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
diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
index 0cbde37c2a..23c5ada1ea 100644
--- a/units/systemd-update-utmp-runlevel.service.in
+++ b/units/systemd-update-utmp-runlevel.service.in
@@ -9,7 +9,7 @@
Description=Notify Audit System and Update UTMP about System Runlevel Changes
DefaultDependencies=no
Wants=local-fs.target sysinit.target
-After=local-fs.target sysinit.target auditd.service runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target
+After=local-fs.target sysinit.target auditd.service runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target systemd-tmpfiles-setup.service
Before=poweroff.service reboot.service halt.service killall.service
[Service]