From 5598454a3f8fc13257e0313d999e6ac9684082e1 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Thu, 21 Nov 2024 20:36:51 +0100 Subject: 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. --- src/fsck/fsck.c | 9 ++------- src/quotacheck/quotacheck.c | 7 +------ 2 files changed, 3 insertions(+), 13 deletions(-) (limited to 'src') 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; } -- cgit v1.2.3