machine-id-setup: allow passing NULL as function argument, for simplicity

diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
index 3efcd5fac22b83b0e5d32fc9784e8c0c0ac6092a..e2e6d0226995f88b1714a32c4132629bced42dd8 100644 (file)
--- a/src/core/machine-id-setup.c
+++ b/src/core/machine-id-setup.c
@@ -157,18 +157,23 @@ static int generate(char id[34], const char *root) {
 }
 
 int machine_id_setup(const char *root) {
+        const char *etc_machine_id, *run_machine_id;
         _cleanup_close_ int fd = -1;
-        int r;
         bool writable = false;
         struct stat st;
         char id[34]; /* 32 + \n + \0 */
-        char *etc_machine_id, *run_machine_id;
+        int r;
 
-        etc_machine_id = strappenda(root, "/etc/machine-id");
-        path_kill_slashes(etc_machine_id);
+        if (isempty(root))  {
+                etc_machine_id = "/etc/machine-id";
+                run_machine_id = "/run/machine-id";
+        } else {
+                etc_machine_id = strappenda(root, "/etc/machine-id");
+                path_kill_slashes((char*) etc_machine_id);
 
-        run_machine_id = strappenda(root, "/run/machine-id");
-        path_kill_slashes(run_machine_id);
+                run_machine_id = strappenda(root, "/run/machine-id");
+                path_kill_slashes((char*) run_machine_id);
+        }
 
         RUN_WITH_UMASK(0000) {
                 /* We create this 0444, to indicate that this isn't really

diff --git a/src/core/main.c b/src/core/main.c
index 899233bf518f872ac364c19398c3773cb3718765..82852d6401ef75198d16192db71cf2b13a186ecc 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1592,7 +1592,7 @@ int main(int argc, char *argv[]) {
                 kmod_setup();
 #endif
                 hostname_setup();
-                machine_id_setup("");
+                machine_id_setup(NULL);
                 loopback_setup();
 
                 test_mtab();