X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmain.c;h=fb34e4d3d19982ff286541ea8e4f7d8d298e7657;hb=1f6d9bc9ee894d4023b7eacea1754986f25bce57;hp=6db42991e83ae03ed0897dbfdd4e3af67d33836f;hpb=e3e45d4f82daa5cd85ba40dde9127df900096c0c;p=elogind.git diff --git a/src/core/main.c b/src/core/main.c index 6db42991e..fb34e4d3d 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -599,8 +599,6 @@ static int config_parse_join_controllers(const char *unit, for (a = arg_join_controllers; *a; a++) { if (strv_overlap(*a, l)) { - char **c; - if (strv_extend_strv(&l, *a) < 0) { strv_free(l); strv_free_free(t); @@ -1477,8 +1475,11 @@ int main(int argc, char *argv[]) { if (in_initrd()) log_info("Running in initial RAM disk."); - } else - log_debug(PACKAGE_STRING " running in user mode. (" SYSTEMD_FEATURES ")"); + } else { + _cleanup_free_ char *t = uid_to_name(getuid()); + log_debug(PACKAGE_STRING " running in user mode for user "PID_FMT"/%s. (" SYSTEMD_FEATURES ")", + getuid(), t); + } if (arg_running_as == SYSTEMD_SYSTEM && !skip_setup) { if (arg_show_status || plymouth_running())