Skip to content

Commit 920c5a8

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) (cherry picked from commit 59b7b0d)
1 parent 366ac4a commit 920c5a8

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
@@ -106,16 +106,11 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
106106
}
107107
}
108108

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

114-
} else if (streq(key, "forcefsck") && !value) {
115-
log_warning("Please pass 'fsck.mode=force' rather than 'forcefsck' on the kernel command line.");
112+
else if (streq(key, "forcefsck") && !value)
116113
arg_force = true;
117-
}
118-
#endif
119114

120115
return 0;
121116
}

src/quotacheck/quotacheck.c

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

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

4540
return 0;
4641
}

0 commit comments

Comments
 (0)