X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Ffsck%2Ffsck.c;h=058f34d64fdc12b83557fc9f14800ab90db34a6a;hb=e88baee88fad8bc59d33b55a7a2d640ef9e16cd6;hp=f25ec49442eaf6c378f107ae0f70082fd46b5cac;hpb=dce818b390a857a11f7dd634684500675cf79833;p=elogind.git

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index f25ec4944..058f34d64 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -112,7 +112,8 @@ static int parse_proc_cmdline(void) {
         if (detect_container(NULL) > 0)
                 return 0;
 
-        if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) {
+        r = read_one_line_file("/proc/cmdline", &line);
+        if (r < 0) {
                 log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
                 return 0;
         }
@@ -125,8 +126,8 @@ static int parse_proc_cmdline(void) {
                         arg_force = true;
                 else if (strneq(w, "fsck.mode=skip", l))
                         arg_skip = true;
-                else if (startswith(w, "fsck.mode"))
-                        log_warning("Invalid fsck.mode= parameter. Ignoring.");
+                else if (startswith(w, "fsck"))
+                        log_warning("Invalid fsck parameter. Ignoring.");
 #if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
                 else if (strneq(w, "fastboot", l))
                         arg_skip = true;
@@ -296,7 +297,7 @@ int main(int argc, char *argv[]) {
                 }
 
                 if (!(udev = udev_new())) {
-                        log_error("Out of memory");
+                        log_oom();
                         goto finish;
                 }