systemctl: suggest 'systemctl daemon-reload' without --system
--system is default anyway, and some poor user might type 9 characters without needing to.
This commit is contained in:
parent
76d5a71de9
commit
1058cbf2ad
|
@ -1037,7 +1037,8 @@ int manager_load_unit_prepare(Manager *m, const char *name, const char *path, DB
|
|||
}
|
||||
}
|
||||
|
||||
if ((r = unit_add_name(ret, name)) < 0) {
|
||||
r = unit_add_name(ret, name);
|
||||
if (r < 0) {
|
||||
unit_free(ret);
|
||||
return r;
|
||||
}
|
||||
|
|
|
@ -850,18 +850,18 @@ int readlink_malloc(const char *p, char **r) {
|
|||
}
|
||||
|
||||
int readlink_and_make_absolute(const char *p, char **r) {
|
||||
char *target, *k;
|
||||
_cleanup_free_ char *target = NULL;
|
||||
char *k;
|
||||
int j;
|
||||
|
||||
assert(p);
|
||||
assert(r);
|
||||
|
||||
if ((j = readlink_malloc(p, &target)) < 0)
|
||||
j = readlink_malloc(p, &target);
|
||||
if (j < 0)
|
||||
return j;
|
||||
|
||||
k = file_in_same_dir(p, target);
|
||||
free(target);
|
||||
|
||||
if (!k)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
@ -1913,8 +1913,8 @@ static int start_unit_one(
|
|||
}
|
||||
|
||||
if (need_daemon_reload(bus, n))
|
||||
log_warning("Warning: Unit file of %s changed on disk, 'systemctl %s daemon-reload' recommended.",
|
||||
n, arg_scope == UNIT_FILE_SYSTEM ? "--system" : "--user");
|
||||
log_warning("Warning: Unit file of %s changed on disk, 'systemctl %sdaemon-reload' recommended.",
|
||||
n, arg_scope == UNIT_FILE_SYSTEM ? "" : "--user ");
|
||||
|
||||
if (s) {
|
||||
char *p;
|
||||
|
@ -2974,10 +2974,10 @@ static void print_status_info(UnitStatusInfo *i) {
|
|||
}
|
||||
|
||||
if (i->need_daemon_reload)
|
||||
printf("\n%sWarning:%s Unit file changed on disk, 'systemctl %s daemon-reload' recommended.\n",
|
||||
printf("\n%sWarning:%s Unit file changed on disk, 'systemctl %sdaemon-reload' recommended.\n",
|
||||
ansi_highlight_red(true),
|
||||
ansi_highlight_red(false),
|
||||
arg_scope == UNIT_FILE_SYSTEM ? "--system" : "--user");
|
||||
arg_scope == UNIT_FILE_SYSTEM ? "" : "--user ");
|
||||
}
|
||||
|
||||
static void show_unit_help(UnitStatusInfo *i) {
|
||||
|
|
Loading…
Reference in New Issue