From: Harald Hoyer <harald@redhat.com>
Date: Wed, 17 Jul 2013 09:19:39 +0000 (+0200)
Subject: remove /run/initramfs/root-fsck logic
X-Git-Tag: v206~59
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=956eaf2b8d6c9999024705ddadc7393bc707de02

remove /run/initramfs/root-fsck logic

dracut uses systemd in the initramfs and does not write these files
anymore.

The state of the root fsck is serialized.
---

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 4629808a7..4359f5990 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -350,14 +350,8 @@ static int nftw_cb(
 };
 
 int mount_setup(bool loaded_policy) {
-
-        static const char relabel[] =
-                "/run/initramfs/root-fsck\0"
-                "/run/initramfs/shutdown\0";
-
         int r;
         unsigned i;
-        const char *j;
 
         for (i = 0; i < ELEMENTSOF(mount_table); i ++) {
                 r = mount_one(mount_table + i, true);
@@ -379,10 +373,6 @@ int mount_setup(bool loaded_policy) {
                 nftw("/dev", nftw_cb, 64, FTW_MOUNT|FTW_PHYS|FTW_ACTIONRETVAL);
                 nftw("/run", nftw_cb, 64, FTW_MOUNT|FTW_PHYS|FTW_ACTIONRETVAL);
 
-                /* Explicitly relabel these */
-                NULSTR_FOREACH(j, relabel)
-                        label_fix(j, true, false);
-
                 after_relabel = now(CLOCK_MONOTONIC);
 
                 log_info("Relabelled /dev and /run in %s.",
diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in
index ef5123feb..563129bad 100644
--- a/units/systemd-fsck-root.service.in
+++ b/units/systemd-fsck-root.service.in
@@ -12,8 +12,6 @@ DefaultDependencies=no
 After=systemd-readahead-collect.service systemd-readahead-replay.service
 Before=local-fs.target shutdown.target
 
-# Dracut informs us with this flag file if the root fsck was already run
-ConditionPathExists=!/run/initramfs/root-fsck
 ConditionPathIsReadWrite=!/
 
 [Service]