main: change check whether /etc is unpopulated to look for /etc/machine-id

[elogind.git] / src / core / main.c

diff --git a/src/core/main.c b/src/core/main.c
index 6981e722d990516b4f7a0cabcaf4647527539d9c..1ca899998ed54e43767f9159f373b389553ff915 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1543,13 +1543,14 @@ int main(int argc, char *argv[]) {
                 if (in_initrd())
                         log_info("Running in initial RAM disk.");
 
-                empty_etc = dir_is_empty("/etc") > 0;
+                empty_etc = access("/etc/machine-id", F_OK) < 0;
                 if (empty_etc)
                         log_info("Running with unpopulated /etc.");
         } 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);
+                _cleanup_free_ char *t;
+
+                t = uid_to_name(getuid());
+                log_debug(PACKAGE_STRING " running in user mode for user "UID_FMT"/%s. (" SYSTEMD_FEATURES ")", getuid(), strna(t));
         }
 
         if (arg_running_as == SYSTEMD_SYSTEM && !skip_setup) {