umount: unescape path from /proc/self/mountinfo first, then check against api mount...

[elogind.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index d6f5c56c2a79372f7ff8daae42639c29cdd0aee7..15bd2e4d1562bf14ad2089811e4845ae3ab05b41 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -545,11 +545,9 @@ static int parse_config_file(void) {
 }
 
 static int parse_proc_cmdline(void) {
-        char *line;
+        char *line, *w, *state;
         int r;
-        char *w;
         size_t l;
-        char *state;
 
         if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) {
                 log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
@@ -1062,8 +1060,8 @@ int main(int argc, char *argv[]) {
                         dbus_error_free(&error);
                 } else if (target->meta.load_state == UNIT_ERROR)
                         log_error("Failed to load default target: %s", strerror(-target->meta.load_error));
-                else if (target->meta.load_state == UNIT_BANNED)
-                        log_error("Default target banned.");
+                else if (target->meta.load_state == UNIT_MASKED)
+                        log_error("Default target masked.");
 
                 if (!target || target->meta.load_state != UNIT_LOADED) {
                         log_info("Trying to load rescue target...");
@@ -1075,8 +1073,8 @@ int main(int argc, char *argv[]) {
                         } else if (target->meta.load_state == UNIT_ERROR) {
                                 log_error("Failed to load rescue target: %s", strerror(-target->meta.load_error));
                                 goto finish;
-                        } else if (target->meta.load_state == UNIT_BANNED) {
-                                log_error("Rescue target banned.");
+                        } else if (target->meta.load_state == UNIT_MASKED) {
+                                log_error("Rescue target masked.");
                                 goto finish;
                         }
                 }