From 95c37d9ede79d940a393a5b3e3e7da804bafdbb5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Wed, 10 Mar 2021 21:19:46 -0300
Subject: [PATCH] recipes: daemons/dbus*: Use the default /var/lib/dbus
 location for UUID gen
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Matías Fonzo <selk@dragora.org>
---
 archive/dbus/rc.main                  | 2 +-
 recipes/daemons/dbus-x11/post-install | 7 ++++++-
 recipes/daemons/dbus-x11/recipe       | 2 +-
 recipes/daemons/dbus/post-install     | 7 ++++++-
 recipes/daemons/dbus/recipe           | 2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/archive/dbus/rc.main b/archive/dbus/rc.main
index 1e345ee6..9a4788af 100644
--- a/archive/dbus/rc.main
+++ b/archive/dbus/rc.main
@@ -16,7 +16,7 @@ start()
     echo "*** ${SVNAME}: Starting dbus ..."
 
     # Validate or generate unique ID file
-    /usr/bin/dbus-uuidgen --ensure=/etc/machine-id
+    /usr/bin/dbus-uuidgen --ensure
 
     exec /usr/bin/dbus-daemon --nofork --system --nopidfile
 }
diff --git a/recipes/daemons/dbus-x11/post-install b/recipes/daemons/dbus-x11/post-install
index b34871ec..66ed328d 100644
--- a/recipes/daemons/dbus-x11/post-install
+++ b/recipes/daemons/dbus-x11/post-install
@@ -1,4 +1,9 @@
 
 # To validate UUIDs (Universally Unique IDs)
-chroot "$rootdir" /usr/bin/dbus-uuidgen --ensure=/etc/machine-id 2> /dev/null
+chroot "$rootdir" /usr/bin/dbus-uuidgen --ensure
+
+# Make symlink for compatibility at /etc
+mkdir -p -- "${rootdir}/var/lib/dbus"
+chown -- messagebus "${rootdir}/var/lib/dbus"
+ln -sf -- "${rootdir}var/lib/dbus/machine-id" "${rootdir}etc"
 
diff --git a/recipes/daemons/dbus-x11/recipe b/recipes/daemons/dbus-x11/recipe
index 2c72f6d1..ae9c2e33 100644
--- a/recipes/daemons/dbus-x11/recipe
+++ b/recipes/daemons/dbus-x11/recipe
@@ -20,7 +20,7 @@ set -e
 
 program=dbus
 version=1.12.20
-release=5
+release=6
 
 pkgname=dbus-x11
 
diff --git a/recipes/daemons/dbus/post-install b/recipes/daemons/dbus/post-install
index b34871ec..66ed328d 100644
--- a/recipes/daemons/dbus/post-install
+++ b/recipes/daemons/dbus/post-install
@@ -1,4 +1,9 @@
 
 # To validate UUIDs (Universally Unique IDs)
-chroot "$rootdir" /usr/bin/dbus-uuidgen --ensure=/etc/machine-id 2> /dev/null
+chroot "$rootdir" /usr/bin/dbus-uuidgen --ensure
+
+# Make symlink for compatibility at /etc
+mkdir -p -- "${rootdir}/var/lib/dbus"
+chown -- messagebus "${rootdir}/var/lib/dbus"
+ln -sf -- "${rootdir}var/lib/dbus/machine-id" "${rootdir}etc"
 
diff --git a/recipes/daemons/dbus/recipe b/recipes/daemons/dbus/recipe
index e92ae584..6ce95ab6 100644
--- a/recipes/daemons/dbus/recipe
+++ b/recipes/daemons/dbus/recipe
@@ -20,7 +20,7 @@ set -e
 
 program=dbus
 version=1.12.20
-release=5
+release=6
 
 # Define a category for the output of the package name
 pkgcategory=daemons
-- 
2.11.4.GIT