chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bootchart: parse /etc/os-release rather than system-release
[elogind.git]
/
src
/
system-update-generator
/
system-update-generator.c
diff --git
a/src/system-update-generator/system-update-generator.c
b/src/system-update-generator/system-update-generator.c
index f4e8dafebd9bdb3986e76c7f4dccfb3ebff82ead..6660192f5e06beb650792f6ceefa5c4a3beea60a 100644
(file)
--- a/
src/system-update-generator/system-update-generator.c
+++ b/
src/system-update-generator/system-update-generator.c
@@
-47,10
+47,8
@@
static int generate_symlink(void) {
}
p = strappend(arg_dest, "/default.target");
}
p = strappend(arg_dest, "/default.target");
- if (!p) {
- log_error("Out of memory.");
- return -ENOMEM;
- }
+ if (!p)
+ return log_oom();
if (symlink(SYSTEM_DATA_UNIT_PATH "/system-update.target", p) < 0) {
free(p);
if (symlink(SYSTEM_DATA_UNIT_PATH "/system-update.target", p) < 0) {
free(p);
@@
-66,13
+64,13
@@
static int generate_symlink(void) {
int main(int argc, char *argv[]) {
int r;
int main(int argc, char *argv[]) {
int r;
- if (argc >
2
) {
- log_error("This program takes
on
e or no arguments.");
+ if (argc >
1 && argc != 4
) {
+ log_error("This program takes
thre
e or no arguments.");
return EXIT_FAILURE;
}
if (argc > 1)
return EXIT_FAILURE;
}
if (argc > 1)
- arg_dest = argv[
1
];
+ arg_dest = argv[
2
];
log_set_target(LOG_TARGET_SAFE);
log_parse_environment();
log_set_target(LOG_TARGET_SAFE);
log_parse_environment();