[arch-commits] Commit in dbus-core/trunk (dbus.install)

2012-06-19 Thread Dave Reisner 
Date: Tuesday, June 19, 2012 @ 06:03:10
  Author: dreisner
Revision: 162057

prefer /etc for the machine-id file

Modified:
  dbus-core/trunk/dbus.install

--+
 dbus.install |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: dbus.install
===
--- dbus.install2012-06-19 09:56:01 UTC (rev 162056)
+++ dbus.install2012-06-19 10:03:10 UTC (rev 162057)
@@ -2,7 +2,7 @@
   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
-  dbus-uuidgen --ensure
+  dbus-uuidgen --ensure=/etc/machine-id
 }
 
 post_upgrade() {

[arch-commits] Commit in dbus-core/trunk (dbus.install)

2012-06-12 Thread Jan de Groot 
Date: Tuesday, June 12, 2012 @ 05:03:45
  Author: jgc
Revision: 161607

Move the pid file the other way around.

Modified:
  dbus-core/trunk/dbus.install

--+
 dbus.install |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: dbus.install
===
--- dbus.install2012-06-12 07:21:42 UTC (rev 161606)
+++ dbus.install2012-06-12 09:03:45 UTC (rev 161607)
@@ -9,8 +9,8 @@
   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
+  if [ -f run/dbus.pid ]; then
+mv run/dbus.pid run/dbus/pid
   fi
 }

[arch-commits] Commit in dbus-core/trunk (dbus.install)

2009-10-31 Thread Jan de Groot 
Date: Saturday, October 31, 2009 @ 07:03:00
  Author: jgc
Revision: 57041

Change pre_remove to post_remove, check for user accounts (FS#14810)

Modified:
  dbus-core/trunk/dbus.install

--+
 dbus.install |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: dbus.install
===
--- dbus.install2009-10-31 10:58:17 UTC (rev 57040)
+++ dbus.install2009-10-31 11:03:00 UTC (rev 57041)
@@ -14,7 +14,11 @@
   fi
 }
 
-pre_remove() {
-  usr/sbin/userdel dbus &>/dev/null
-  usr/sbin/groupdel dbus &>/dev/null
+post_remove() {
+  if getent passwd dbus >/dev/null; then
+usr/sbin/userdel dbus
+  fi
+  if getent group dbus >/dev/null; then
+usr/sbin/groupdel dbus
+  fi
 }