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:
61902ea
)
main: initialize default boot target from argv[1]
author
Lennart Poettering
<lennart@poettering.net>
Sun, 4 Apr 2010 20:49:26 +0000
(22:49 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Sun, 4 Apr 2010 20:49:26 +0000
(22:49 +0200)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index cb4cc211b7d64996412fa0a06b58907aa6a68119..838f5c89e3812a97e21503a000329af5d9f4c0cb 100644
(file)
--- 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;
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));
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;
}
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;
}
log_error("Failed to load default target: %s", strerror(-r));
goto finish;
}