chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: make bootup graph consistent
[elogind.git]
/
src
/
run
/
run.c
diff --git
a/src/run/run.c
b/src/run/run.c
index 723e0cb31a090f8b64ae1f86c937ef23a16e2740..3ded2c7e66ebd9a4cc427dcf9e53fa4e71303289 100644
(file)
--- a/
src/run/run.c
+++ b/
src/run/run.c
@@
-241,14
+241,12
@@
static int parse_argv(int argc, char *argv[]) {
break;
case ARG_SETENV:
break;
case ARG_SETENV:
-
if (strv_extend(&arg_environment, optarg) < 0)
return log_oom();
break;
case 'p':
if (strv_extend(&arg_environment, optarg) < 0)
return log_oom();
break;
case 'p':
-
if (strv_extend(&arg_property, optarg) < 0)
return log_oom();
if (strv_extend(&arg_property, optarg) < 0)
return log_oom();
@@
-389,11
+387,8
@@
static int transient_unit_set_properties(sd_bus_message *m, char **properties) {
return r;
r = bus_append_unit_property_assignment(m, *i);
return r;
r = bus_append_unit_property_assignment(m, *i);
- if (r < 0) {
- r = sd_bus_message_append(m, "sv", 0);
- if (r < 0)
- return r;
- }
+ if (r < 0)
+ return r;
r = sd_bus_message_close_container(m);
if (r < 0)
r = sd_bus_message_close_container(m);
if (r < 0)
@@
-494,7
+489,7
@@
static int transient_service_set_properties(sd_bus_message *m, char **argv, cons
if (e) {
char *n;
if (e) {
char *n;
- n = str
append
a("TERM=", e);
+ n = str
join
a("TERM=", e);
r = sd_bus_message_append(m,
"(sv)",
"Environment", "as", 1, n);
r = sd_bus_message_append(m,
"(sv)",
"Environment", "as", 1, n);
@@
-781,7
+776,7
@@
static int start_transient_service(
if (!arg_quiet)
log_info("Running as unit %s.\nPress ^] three times within 1s to disconnect TTY.", service);
if (!arg_quiet)
log_info("Running as unit %s.\nPress ^] three times within 1s to disconnect TTY.", service);
- r = pty_forward_new(event, master, false, &forward);
+ r = pty_forward_new(event, master, false,
false,
&forward);
if (r < 0)
return log_error_errno(r, "Failed to create PTY forwarder: %m");
if (r < 0)
return log_error_errno(r, "Failed to create PTY forwarder: %m");