fsck: skip root fsck if dracut already did it

diff --git a/TODO b/TODO
index f7269f194c2086f24409ebe2e95822e1e299a561..5ec7487e472da25da3e6a61cd52a09eda7f490fe 100644 (file)
--- a/TODO
+++ b/TODO
@@ -7,6 +7,8 @@ Bugs:
 
 * fsck.btrfs non-existance should not cause mounting to fail
 
+* single user service needs to be masked?
+
 Features:
 
 * Maybe store in unit files whether a service should be enabled by default on package installation

diff --git a/units/fsck-root.service.in b/units/fsck-root.service.in
index 2f89d0e63bc1d7ec405a27feb932cafac48e4478..cb654260c03ad4ef265be06124d1f7bd301fb966 100644 (file)
--- a/units/fsck-root.service.in
+++ b/units/fsck-root.service.in
@@ -11,6 +11,9 @@ DefaultDependencies=no
 After=systemd-readahead-collect.service systemd-readahead-replay.service
 Before=local-fs.target shutdown.target remount-rootfs.service quotacheck.service
 
+# Dracut informs us with this flag file if the root fsck was already run
+ConditionPathExists=!/dev/.initramfs/fsck
+
 [Service]
 Type=oneshot
 RemainAfterExit=no