From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 4 Jul 2014 01:13:05 +0000 (+0200)
Subject: main: change check whether /etc is unpopulated to look for /etc/machine-id
X-Git-Tag: v216~765
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=baa1bdf70f21848fbe01d3f383ae0f59d86a9bf3;p=elogind.git

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

Previously, we checked whether /etc was completely empty. This makes it
difficult though for container managers such as nspawn to install a
small number of files (such as /etc/timezone), and have the system
otherwise populate its own tree.

Hence, change this by looking for /etc/machine-id, which should be a
good sign whether /etc is populated or not.
---

diff --git a/src/core/main.c b/src/core/main.c
index 38835fc62..1ca899998 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1543,7 +1543,7 @@ 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 {