From: Felipe Sateler <fsateler@gmail.com>
Date: Sun, 26 Feb 2017 16:10:36 +0000 (-0300)
Subject: Also nuke the dbus machine id
X-Git-Tag: v2~23^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F62%2Fhead;p=thirdparty%2Fmkosi.git

Also nuke the dbus machine id

Otherwise the machine-id will not really be a new one
---

diff --git a/mkosi b/mkosi
index df875c88a..d6a4e5c8b 100755
--- a/mkosi
+++ b/mkosi
@@ -937,6 +937,10 @@ def reset_machine_id(args, workspace, run_build_script):
         machine_id = os.path.join(workspace, 'root', 'etc/machine-id')
         os.unlink(machine_id)
         open(machine_id, "w+b").close()
+        dbus_machine_id = os.path.join(workspace, 'root', 'var/lib/dbus/machine-id')
+        if os.path.exists(dbus_machine_id):
+            os.unlink(dbus_machine_id)
+            os.symlink('../../../etc/machine-id', dbus_machine_id)
 
 def set_root_password(args, workspace, run_build_script):
     "Set the root account password, or just delete it so it's easy to log in"