summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-08-17 18:04:06 +0200
committerLennart Poettering <lennart@poettering.net>2010-08-17 18:13:47 +0200
commitf276a41821fcd2b7e4968edef46ba3bd99706ecf (patch)
tree15b6a49f100af8738c2868eb0e83d0079f9f0f07
parent888c6216ca9239be260fd832f900b9fcd784f806 (diff)
shutdown: drop -f/-F switches again, simply because we don't want to condone non-ro root dirs
Instead of using /forcefsck and /fastboot people should just kernel command line options to achieve the same.
-rw-r--r--man/shutdown.xml20
-rw-r--r--src/systemctl.c20
2 files changed, 0 insertions, 40 deletions
diff --git a/man/shutdown.xml b/man/shutdown.xml
index c48e141879..d6bdad37fa 100644
--- a/man/shutdown.xml
+++ b/man/shutdown.xml
@@ -147,26 +147,6 @@
</varlistentry>
<varlistentry>
- <term><option>-f</option></term>
-
- <listitem><para>Skip file system check
- on reboot. This is equivalent to
- creating the
- <filename>/fastboot</filename> file
- before going down.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-F</option></term>
-
- <listitem><para>Force file system
- check on reboot. This is equivalent to
- creating the
- <filename>/forcefsck</filename> file
- before going down.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>-c</option></term>
<listitem><para>Cancel a pending
diff --git a/src/systemctl.c b/src/systemctl.c
index 44b884800b..a8a5e0c207 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -70,8 +70,6 @@ static bool arg_force = false;
static bool arg_defaults = false;
static char **arg_wall = NULL;
static usec_t arg_when = 0;
-static bool arg_skip_fsck = false;
-static bool arg_force_fsck = false;
static enum action {
ACTION_INVALID,
ACTION_SYSTEMCTL,
@@ -3838,8 +3836,6 @@ static int shutdown_help(void) {
" -h Equivalent to --poweroff, overriden by --halt\n"
" -k Don't halt/power-off/reboot, just send warnings\n"
" --no-wall Don't send wall message before halt/power-off/reboot\n"
- " -f Skip fsck on reboot\n"
- " -F Force fsck on reboot\n"
" -c Cancel a pending shutdown\n",
program_invocation_short_name);
@@ -4215,14 +4211,6 @@ static int shutdown_parse_argv(int argc, char *argv[]) {
/* Compatibility nops */
break;
- case 'f':
- arg_skip_fsck = true;
- break;
-
- case 'F':
- arg_force_fsck = true;
- break;
-
case 'c':
arg_action = ACTION_CANCEL_SHUTDOWN;
break;
@@ -4812,14 +4800,6 @@ static int halt_main(DBusConnection *bus) {
return -EPERM;
}
- if (arg_force_fsck) {
- if ((r = touch("/forcefsck")) < 0)
- log_warning("Failed to create /forcefsck: %s", strerror(-r));
- } else if (arg_skip_fsck) {
- if ((r = touch("/fastboot")) < 0)
- log_warning("Failed to create /fastboot: %s", strerror(-r));
- }
-
if (arg_when > 0) {
char *m;
char date[FORMAT_TIMESTAMP_MAX];