chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
335aa75
)
fsck: don't be idempotent for root directories
author
Lennart Poettering
<lennart@poettering.net>
Tue, 19 Oct 2010 22:44:09 +0000
(
00:44
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 19 Oct 2010 22:44:09 +0000
(
00:44
+0200)
src/fsck.c
patch
|
blob
|
history
diff --git
a/src/fsck.c
b/src/fsck.c
index eca2212f476de8dde727097b3f0402e6d4ec4014..e13dcf4d9d975a95cfc46a4a86c13bb0f5f932e0 100644
(file)
--- a/
src/fsck.c
+++ b/
src/fsck.c
@@
-142,6
+142,7
@@
int main(int argc, char *argv[]) {
struct udev *udev = NULL;
struct udev_device *udev_device = NULL;
const char *device;
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.");
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 (!arg_force && arg_skip)
return 0;
- if (argc > 1)
+ if (argc > 1)
{
device = argv[1];
device = argv[1];
- else {
+ root_directory = false;
+ } else {
struct stat st;
/* Find root device */
struct stat st;
/* Find root device */
@@
-188,13
+190,17
@@
int main(int argc, char *argv[]) {
log_error("Failed to detect device node of root directory.");
goto finish;
}
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++] = "/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";
if (arg_force)
cmdline[i++] = "-f";