diff options
author | Harald Hoyer <harald@redhat.com> | 2013-07-17 11:19:39 +0200 |
---|---|---|
committer | Harald Hoyer <harald@redhat.com> | 2013-07-17 11:33:07 +0200 |
commit | 956eaf2b8d6c9999024705ddadc7393bc707de02 (patch) | |
tree | d7a89e741c9e5a3814211cfabe9e00d538cd9ea7 | |
parent | 69af45035913e7119cffd94c542bd3039600e45d (diff) |
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.
-rw-r--r-- | src/core/mount-setup.c | 10 | ||||
-rw-r--r-- | units/systemd-fsck-root.service.in | 2 |
2 files changed, 0 insertions, 12 deletions
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 @@ -347,20 +347,14 @@ static int nftw_cb( return FTW_SKIP_SUBTREE; return FTW_CONTINUE; }; 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); if (r < 0) return r; @@ -376,16 +370,12 @@ int mount_setup(bool loaded_policy) { before_relabel = now(CLOCK_MONOTONIC); 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.", format_timespan(timespan, sizeof(timespan), after_relabel - before_relabel, 0)); } 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 @@ -9,14 +9,12 @@ Description=File System Check on Root Device Documentation=man:systemd-fsck@.service(8) 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] Type=oneshot RemainAfterExit=no ExecStart=@rootlibexecdir@/systemd-fsck |