From 920c5a8ef2793400a13835bda7acd604b81eaa5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 21 Nov 2024 20:36:51 +0100 Subject: [PATCH] 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. (cherry picked from commit 5598454a3f8fc13257e0313d999e6ac9684082e1) (cherry picked from commit eb841e9b8eb5ec47c46617b288135b2119694ea0) (cherry picked from commit 59d4a05e3bfcce8cf495e0e39e29f36849273c68) (cherry picked from commit dc845754adeb410e4c8d6b10de6909a6c19c1ade) (cherry picked from commit 59b7b0d318c522856afb55478a4552817da74f32) --- src/fsck/fsck.c | 9 ++------- src/quotacheck/quotacheck.c | 7 +------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index ba76e1b0af..09f7823277 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -106,16 +106,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 575965c470..e0088d39fd 100644 --- a/src/quotacheck/quotacheck.c +++ b/src/quotacheck/quotacheck.c @@ -33,14 +33,9 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat arg_skip = true; else log_warning("Invalid quotacheck.mode= parameter '%s'. Ignoring.", 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."); + } else if (streq(key, "forcequotacheck") && !value) arg_force = true; - } -#endif return 0; }