systemctl: try to reload daemon after enable/disable only when not running in a chroot

[elogind.git] / src / locale / localectl.c

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 290edcc103bbdbc2866f8972ad982ebc8448d4e5..ce31e1ffce9c97459cfe9db44090c317a1dc3d91 100644 (file)
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -432,7 +432,6 @@ static int add_locales_from_libdir (Set *locales) {
 static int list_locales(DBusConnection *bus, char **args, unsigned n) {
         _cleanup_set_free_ Set *locales;
         _cleanup_strv_free_ char **l = NULL;
-        char **j;
         int r;
 
         locales = set_new(string_hash_func, string_compare_func);
@@ -455,8 +454,7 @@ static int list_locales(DBusConnection *bus, char **args, unsigned n) {
 
         pager_open_if_enabled();
 
-        STRV_FOREACH(j, l)
-                puts(*j);
+        strv_print(l);
 
         return 0;
 }
@@ -539,7 +537,6 @@ static int nftw_cb(
 
 static int list_vconsole_keymaps(DBusConnection *bus, char **args, unsigned n) {
         char _cleanup_strv_free_ **l = NULL;
-        char **i;
 
         keymaps = set_new(string_hash_func, string_compare_func);
         if (!keymaps)
@@ -566,9 +563,7 @@ static int list_vconsole_keymaps(DBusConnection *bus, char **args, unsigned n) {
 
         pager_open_if_enabled();
 
-        STRV_FOREACH(i, l)
-                puts(*i);
-
+        strv_print(l);
 
         return 0;
 }
@@ -614,7 +609,7 @@ static int set_x11_keymap(DBusConnection *bus, char **args, unsigned n) {
 static int help(void) {
 
         printf("%s [OPTIONS...] COMMAND ...\n\n"
-               "Query or change system time and date settings.\n\n"
+               "Query or change system locale and keyboard settings.\n\n"
                "  -h --help              Show this help\n"
                "     --version           Show package version\n"
                "     --no-convert        Don't convert keyboard mappings\n"