From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 22 Oct 2014 18:29:25 +0000 (+0200)
Subject: firstboot: don't prohibit re-generating the machine id on the current root fs
X-Git-Tag: v217~155
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=07a60cc13c48c5f79616b07aad2808bfe809de22

firstboot: don't prohibit re-generating the machine id on the current root fs

If it really is missing it should be safe to create it.

Also see:

http://lists.freedesktop.org/archives/systemd-devel/2014-August/022726.html
---

diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 6b0d2fc86..93273d903 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -451,9 +451,6 @@ static int process_machine_id(void) {
         if (faccessat(AT_FDCWD, etc_machine_id, F_OK, AT_SYMLINK_NOFOLLOW) >= 0)
                 return 0;
 
-        if (!arg_root)
-                return 0;
-
         if (sd_id128_equal(arg_machine_id, SD_ID128_NULL))
                 return 0;