From 78406a53eea1e9b51bd49169f40823dab218dad5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 14 Mar 2014 01:20:08 +0000 Subject: [PATCH] fix(sys-apps/dbus) machine-id fixes Properly create the /var/lib/dbus/machine-id symlink. Create a "known" machine id as part of the build process, this will be overwritten by the boot sequence with a "unique" one when booting for the first time. --- .../{dbus-1.6.12-r3.ebuild => dbus-1.6.12-r4.ebuild} | 0 .../coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild | 9 ++++----- 2 files changed, 4 insertions(+), 5 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/{dbus-1.6.12-r3.ebuild => dbus-1.6.12-r4.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12-r4.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12-r4.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild index bbe1c3717a..349216c926 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.12.ebuild @@ -188,9 +188,8 @@ pkg_postinst() { ewarn "Don't do this while X is running because it will restart your X as well." fi - # Ensure unique id is generated and put it in /etc wrt #370451 but symlink - # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse - # dependencies with hardcoded paths (although the known ones got fixed already) - dbus-uuidgen --ensure="${EROOT}"/etc/machine-id - ln -sf "${EROOT}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id + # Put a "known" machine id into /etc/machine-id so that when we boot, + # if it matches, then we can override it with a unique one. + echo "42000000000000000000000000000042" > "${EROOT}"/etc/machine-id + ln -sf ../../../etc/machine-id "${EROOT}"/var/lib/dbus/machine-id }