Skip to content

Commit 59b7b0d

Browse files
keszybzbluca
authored andcommitted
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 5598454) (cherry picked from commit eb841e9) (cherry picked from commit 59d4a05) (cherry picked from commit dc84575)
1 parent bd4b4d6 commit 59b7b0d

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

src/fsck/fsck.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,11 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
104104
}
105105
}
106106

107-
#if HAVE_SYSV_COMPAT
108-
else if (streq(key, "fastboot") && !value) {
109-
log_warning("Please pass 'fsck.mode=skip' rather than 'fastboot' on the kernel command line.");
107+
else if (streq(key, "fastboot") && !value)
110108
arg_skip = true;
111109

112-
} else if (streq(key, "forcefsck") && !value) {
113-
log_warning("Please pass 'fsck.mode=force' rather than 'forcefsck' on the kernel command line.");
110+
else if (streq(key, "forcefsck") && !value)
114111
arg_force = true;
115-
}
116-
#endif
117112

118113
return 0;
119114
}

src/quotacheck/quotacheck.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,9 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
3232
arg_skip = true;
3333
else
3434
log_warning("Invalid quotacheck.mode= parameter '%s'. Ignoring.", value);
35-
}
3635

37-
#if HAVE_SYSV_COMPAT
38-
else if (streq(key, "forcequotacheck") && !value) {
39-
log_warning("Please use 'quotacheck.mode=force' rather than 'forcequotacheck' on the kernel command line.");
36+
} else if (streq(key, "forcequotacheck") && !value)
4037
arg_force = true;
41-
}
42-
#endif
4338

4439
return 0;
4540
}

0 commit comments

Comments
 (0)