From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 4 Apr 2010 20:49:26 +0000 (+0200)
Subject: main: initialize default boot target from argv[1]
X-Git-Tag: v1~669
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=27b14a2297d296f7a2c47dd20d7e0c6fb8acd20c;ds=sidebyside

main: initialize default boot target from argv[1]
---

diff --git a/main.c b/main.c
index cb4cc211b..838f5c89e 100644
--- a/main.c
+++ b/main.c
@@ -34,6 +34,12 @@ int main(int argc, char *argv[]) {
         Unit *target = NULL;
         Job *job = NULL;
         int r, retval = 1;
+        const char *default_unit;
+
+        if (argc >= 2)
+                default_unit = argv[1];
+        else
+                default_unit = SPECIAL_DEFAULT_TARGET;
 
         if ((r = manager_new(&m)) < 0) {
                 log_error("Failed to allocate manager object: %s", strerror(-r));
@@ -45,7 +51,9 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        if ((r = manager_load_unit(m, SPECIAL_DEFAULT_TARGET, &target)) < 0) {
+        log_debug("Activating default unit: %s", default_unit);
+
+        if ((r = manager_load_unit(m, default_unit, &target)) < 0) {
                 log_error("Failed to load default target: %s", strerror(-r));
                 goto finish;
         }