mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-22 14:55:36 +08:00
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
This commit is contained in:
committed by
Mathew Sutcliffe
parent
d5ab73e1bc
commit
f952775665
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -165,6 +165,9 @@
|
||||
<distributionFile>
|
||||
<origin>../../dist/bin/dbus-daemon</origin>
|
||||
</distributionFile>
|
||||
<distributionFile>
|
||||
<origin>../../dist/bin/dbus-uuidgen</origin>
|
||||
</distributionFile>
|
||||
</distributionFileList>
|
||||
</folder>
|
||||
<folder>
|
||||
|
||||
Reference in New Issue
Block a user