napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[machineid] Use same approach as we do in Manjaro

Browse Source 
- See also https://gitlab.manjaro.org/applications/calamares/commit/da8f45ae
- Fixes #1314
This commit is contained in:
Philip Müller 2020-02-07 10:34:01 +01:00 committed by GitHub
parent c766a0f10f
commit 72d742e2f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/machineid/main.py
View File

@ -54,10 +54,6 @@ def run():
enable_symlink = libcalamares.job.configuration["symlink"] enable_symlink = libcalamares.job.configuration["symlink"]
target_systemd_machineid_file = root_mount_point + "/etc/machine-id" target_systemd_machineid_file = root_mount_point + "/etc/machine-id"
target_dbus_machineid_file = root_mount_point + "/var/lib/dbus/machine-id" target_dbus_machineid_file = root_mount_point + "/var/lib/dbus/machine-id"
target_dbus_folder = root_mount_point + "/var/lib/dbus"
if not os.path.exists(target_dbus_folder):
os.mkdir(target_dbus_folder, 0644)
if os.path.exists(target_dbus_machineid_file): if os.path.exists(target_dbus_machineid_file):
os.remove(target_dbus_machineid_file) os.remove(target_dbus_machineid_file)
@ -69,7 +65,7 @@ def run():
if enable_dbus: if enable_dbus:
if enable_symlink and os.path.exists(target_systemd_machineid_file): if enable_symlink and os.path.exists(target_systemd_machineid_file):
check_target_env_call(["ln", "-s", "/etc/machine-id", check_target_env_call(["ln", "-sf", "/etc/machine-id",
"/var/lib/dbus/machine-id"]) "/var/lib/dbus/machine-id"])
else: else:
check_target_env_call(["dbus-uuidgen", "--ensure"]) check_target_env_call(["dbus-uuidgen", "--ensure"])