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 6b0d2fc86af960ad0196515084ab72f2cb058e14..93273d903c7299e040e81e1ac13296e6dd4db6b2 100644 (file)
--- 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 (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;
 
         if (sd_id128_equal(arg_machine_id, SD_ID128_NULL))
                 return 0;