1 files changed, 8 insertions, 9 deletions
diff --git a/abs/core/dbus-core/dbus.install b/abs/core/dbus-core/dbus.install
index 44f4475..f1ffd61 100644
--- a/abs/core/dbus-core/dbus.install
+++ b/abs/core/dbus-core/dbus.install
@@ -1,24 +1,23 @@
 post_install() {
-  getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus
-  getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
-  usr/bin/passwd -l dbus &>/dev/null
-  dbus-uuidgen --ensure
+  getent group dbus >/dev/null || groupadd -g 81 dbus
+  getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
+  passwd -l dbus &>/dev/null
 }
 
 post_upgrade() {
   post_install
 
-  #Make sure new rc script can shutdown running dbus
-  if [ -f var/run/dbus/pid ]; then
-    mv var/run/dbus/pid var/run/dbus.pid
+  # Make sure new rc script can shutdown running dbus
+  if [ -f run/dbus.pid -a -d run/dbus ]; then
+    mv run/dbus.pid run/dbus/pid
   fi
 }
 
 post_remove() {
   if getent passwd dbus >/dev/null; then
-    usr/sbin/userdel dbus
+    userdel dbus
   fi
   if getent group dbus >/dev/null; then
-    usr/sbin/groupdel dbus
+    groupdel dbus
   fi
 }