picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

systemctl: suggest 'systemctl daemon-reload' without --system

Browse source 
--system is default anyway, and some poor user might type 9
characters without needing to.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-05-30 20:28:09 -04:00
parent 76d5a71de9
commit 1058cbf2ad
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/manager.c
View file

@ -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); unit_free(ret);
return r; return r;
} }

8
src/shared/util.c
View file

@ -850,18 +850,18 @@ int readlink_malloc(const char *p, char **r) {
} }
int readlink_and_make_absolute(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; int j;
assert(p); assert(p);
assert(r); assert(r);
if ((j = readlink_malloc(p, &target)) < 0) j = readlink_malloc(p, &target);
if (j < 0)
return j; return j;
k = file_in_same_dir(p, target); k = file_in_same_dir(p, target);
free(target);
if (!k) if (!k)
return -ENOMEM; return -ENOMEM;

8
src/systemctl/systemctl.c
View file

@ -1913,8 +1913,8 @@ static int start_unit_one(
} }
if (need_daemon_reload(bus, n)) if (need_daemon_reload(bus, n))
log_warning("Warning: Unit file of %s changed on disk, 'systemctl %s daemon-reload' recommended.", log_warning("Warning: Unit file of %s changed on disk, 'systemctl %sdaemon-reload' recommended.",
n, arg_scope == UNIT_FILE_SYSTEM ? "--system" : "--user"); n, arg_scope == UNIT_FILE_SYSTEM ? "" : "--user ");
if (s) { if (s) {
char *p; char *p;
@ -2974,10 +2974,10 @@ static void print_status_info(UnitStatusInfo *i) {
} }
if (i->need_daemon_reload) 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(true),
ansi_highlight_red(false), ansi_highlight_red(false),
arg_scope == UNIT_FILE_SYSTEM ? "--system" : "--user"); arg_scope == UNIT_FILE_SYSTEM ? "" : "--user ");
} }
static void show_unit_help(UnitStatusInfo *i) { static void show_unit_help(UnitStatusInfo *i) {