From f95277566584ffd97de1c9258220b8242b7b7c18 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Fri, 5 May 2017 22:36:07 +0100
Subject: [PATCH] Use dbus-uuidgen to create dbus machine id after installation

Summary:
The file machine-id was missing on target machines and needs
to be created during installation.

Reviewers: kbasan, msutcliffe

Reviewed By: msutcliffe

Subscribers: jenkins

Tags: #swift_pilot_client

Differential Revision: https://dev.swift-project.org/D17
---
 install.pri                               |  5 +++++
 installer/installbuilder/project.xml      | 19 +++++++++++++++++++
 installer/installbuilder/qt5-binaries.xml |  3 +++
 3 files changed, 27 insertions(+)

diff --git a/install.pri b/install.pri
index 2f4d2cb2d..4bad1baab 100644
--- a/install.pri
+++ b/install.pri
@@ -332,3 +332,8 @@ bitrock_builder_bin = $$(BITROCK_BUILDER)
     publish_installer.depends = create_installer
     QMAKE_EXTRA_TARGETS += publish_installer
 }
+
+############### Bitrock Installbuilder Files ###############
+
+# List them in IDE
+OTHER_FILES += installer/installbuilder/*.xml
diff --git a/installer/installbuilder/project.xml b/installer/installbuilder/project.xml
index 3a93fbff1..af856af98 100644
--- a/installer/installbuilder/project.xml
+++ b/installer/installbuilder/project.xml
@@ -6,6 +6,7 @@
     <leftImage>../images/leftimage.png</leftImage>
     <logoImage>../images/logo.png</logoImage>
     <splashImage>../images/splashscreen.png</splashImage>
+    <requireInstallationByRootUser>1</requireInstallationByRootUser>
     <componentList>
         <include>
             <file>swift.xml</file>
@@ -30,6 +31,24 @@ update_download_location = ${system_temp_directory}
 check_for_updates = 1
 </text>
         </writeFile>
+        <createDirectory>
+            <path>/usr/local/var/lib/dbus</path>
+            <ruleList>
+                <platformTest>
+                    <type>osx</type>
+                </platformTest>
+            </ruleList>
+        </createDirectory>
+        <runProgram>
+            <program>bin/dbus-uuidgen</program>
+            <programArguments>--ensure=/usr/local/var/lib/dbus/machine-id</programArguments>
+            <workingDirectory>${installdir}</workingDirectory>
+            <ruleList>
+                <platformTest>
+                    <type>osx</type>
+                </platformTest>
+            </ruleList>
+        </runProgram>
     </postInstallationActionList>
     <preUninstallationActionList>
         <deleteFile>
diff --git a/installer/installbuilder/qt5-binaries.xml b/installer/installbuilder/qt5-binaries.xml
index 035c33960..0de76713a 100644
--- a/installer/installbuilder/qt5-binaries.xml
+++ b/installer/installbuilder/qt5-binaries.xml
@@ -165,6 +165,9 @@
                 <distributionFile>
                     <origin>../../dist/bin/dbus-daemon</origin>
                 </distributionFile>
+                <distributionFile>
+                    <origin>../../dist/bin/dbus-uuidgen</origin>
+                </distributionFile>
             </distributionFileList>
         </folder>
         <folder>