summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2024-11-21 20:36:51 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2024-11-23 09:30:56 +0100
commit5598454a3f8fc13257e0313d999e6ac9684082e1 (patch)
tree78f68fcb76e40d1807c21ad4422d303d77185f3b
parentlink README.logs from tmpfiles.d/legacy.conf only if available (diff)
downloadsystemd-5598454a3f8fc13257e0313d999e6ac9684082e1.tar.xz
systemd-5598454a3f8fc13257e0313d999e6ac9684082e1.zip
Undeprecate commandline params forcequotacheck, fastboot, and forcefsck
Those are historical names, but there is nothing wrong with them. The files on / (/fastboot, /forcefsck, and /forcequotacheck) are problematic because they require a modification of the root file system. But the commandline params work fine. They have the obvious advantage compared to our "modern" option that they are much easier to type without looking up the spelling in the docs. Undeprecate them to avoid unnecessary churn.
-rw-r--r--src/fsck/fsck.c9
-rw-r--r--src/quotacheck/quotacheck.c7
2 files changed, 3 insertions, 13 deletions
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 4ec8989a3f..c8dea245c8 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -98,16 +98,11 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
}
}
-#if HAVE_SYSV_COMPAT
- else if (streq(key, "fastboot") && !value) {
- log_warning("Please pass 'fsck.mode=skip' rather than 'fastboot' on the kernel command line.");
+ else if (streq(key, "fastboot") && !value)
arg_skip = true;
- } else if (streq(key, "forcefsck") && !value) {
- log_warning("Please pass 'fsck.mode=force' rather than 'forcefsck' on the kernel command line.");
+ else if (streq(key, "forcefsck") && !value)
arg_force = true;
- }
-#endif
return 0;
}
diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index d46f280bf4..63940142ac 100644
--- a/src/quotacheck/quotacheck.c
+++ b/src/quotacheck/quotacheck.c
@@ -36,14 +36,9 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
arg_skip = true;
else
log_warning("Invalid quotacheck.mode= value, ignoring: %s", value);
- }
-#if HAVE_SYSV_COMPAT
- else if (streq(key, "forcequotacheck") && !value) {
- log_warning("Please use 'quotacheck.mode=force' rather than 'forcequotacheck' on the kernel command line. Proceeding anyway.");
+ } else if (streq(key, "forcequotacheck") && !value)
arg_force = true;
- }
-#endif
return 0;
}