X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Ffsck.c;h=fe56be74ce8f8633aff03202eea7b95e949dc0f6;hb=51ccf641d7573041cf40f131cfd004eed1dc6f82;hp=eca2212f476de8dde727097b3f0402e6d4ec4014;hpb=6e8ebcc7de321bac0ba494365a85a19040654405;p=elogind.git diff --git a/src/fsck.c b/src/fsck.c index eca2212f4..fe56be74c 100644 --- a/src/fsck.c +++ b/src/fsck.c @@ -135,13 +135,14 @@ static void test_files(void) { } int main(int argc, char *argv[]) { - const char *cmdline[8]; + const char *cmdline[7]; int i = 0, r = EXIT_FAILURE, q; pid_t pid; siginfo_t status; struct udev *udev = NULL; struct udev_device *udev_device = NULL; const char *device; + bool root_directory; if (argc > 2) { log_error("This program expects one or no arguments."); @@ -158,9 +159,10 @@ int main(int argc, char *argv[]) { if (!arg_force && arg_skip) return 0; - if (argc > 1) + if (argc > 1) { device = argv[1]; - else { + root_directory = false; + } else { struct stat st; /* Find root device */ @@ -188,13 +190,16 @@ int main(int argc, char *argv[]) { log_error("Failed to detect device node of root directory."); goto finish; } + + root_directory = true; } cmdline[i++] = "/sbin/fsck"; cmdline[i++] = "-a"; cmdline[i++] = "-T"; - cmdline[i++] = "-C"; - cmdline[i++] = "-M"; + + if (!root_directory) + cmdline[i++] = "-M"; if (arg_force) cmdline[i++] = "-f";