Thu Jun 28 00:01:48 UTC 2012

5 files changed, 12 insertions, 15 deletions

diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD
index c2ca50617..587604851 100644
--- a/core/dbus-core/PKGBUILD
+++ b/core/dbus-core/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 162315 2012-06-24 22:30:38Z dreisner $
+# $Id: PKGBUILD 162424 2012-06-27 01:43:40Z dreisner $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus-core
 pkgver=1.6.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow') # shadow for install scriptlet FS#29341
+depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 'systemd-tools') # shadow for install scriptlet FS#29341
 makedepends=('libx11')
 conflicts=('dbus<1.2.3-2')
 options=(!libtool)
diff --git a/core/dbus-core/dbus.install b/core/dbus-core/dbus.install
index 88a568429..f1ffd61a8 100644
--- a/core/dbus-core/dbus.install
+++ b/core/dbus-core/dbus.install
@@ -2,12 +2,6 @@ post_install() {
   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
-
-  if [[ ! -L var/lib/dbus/machine-id ]]; then
-    [[ -e var/lib/dbus/machine-id && ! -e etc/machine-id ]] && mv var/lib/dbus/machine-id etc/
-    ln -sf ../../../etc/machine-id var/lib/dbus/
-  fi
-  dbus-uuidgen --ensure=etc/machine-id
 }
 
 post_upgrade() {
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 367b26834..2d9323250 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat')
 pkgver=185
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -132,6 +132,7 @@ package_systemd() {
   mv "$pkgdir"/etc/udev etc
   mv "$pkgdir"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc
   mv "$pkgdir"/usr/bin/udevadm usr/bin
+  mv "$pkgdir"/usr/bin/systemd-machine-id-setup usr/bin
   mv "$pkgdir"/usr/lib/pkgconfig usr/lib
   mv "$pkgdir"/usr/lib/systemd/systemd-udevd usr/lib/systemd
   mv "$pkgdir"/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system
@@ -147,7 +148,7 @@ package_systemd() {
   mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html
   mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7
   mv "$pkgdir"/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 usr/share/man/man8
-  mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt}.1 usr/share/man/man1
+  mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1
   mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5
   mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf}.5 usr/share/man/man5
   mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin
diff --git a/core/systemd/systemd-tools.install b/core/systemd/systemd-tools.install
index c1c19d15d..7d0bd8790 100644
--- a/core/systemd/systemd-tools.install
+++ b/core/systemd/systemd-tools.install
@@ -1,7 +1,13 @@
 # arg 1:  the new package version
 # arg 2:  the old package version
 
+post_install() {
+  systemd-machine-id-setup
+}
+
 post_upgrade() {
+  systemd-machine-id-setup
+
   if [ "$(vercmp $2 174)" -lt 0 ]; then
     echo " * We now use upstream rules for assigning devices to the 'disk', 'optical',"
     echo "   'scanner' and 'video' groups. Beware of any changes."
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install
index cb82b6c8c..e369f094d 100644
--- a/core/systemd/systemd.install
+++ b/core/systemd/systemd.install
@@ -5,8 +5,6 @@ sd_booted() {
 }
 
 post_install() {
-  systemd-machine-id-setup
-
   # enable getty@tty1 by default, but don't track the file
   systemctl enable getty@.service
 
@@ -15,8 +13,6 @@ post_install() {
 }
 
 post_upgrade() {
-  systemd-machine-id-setup
-
   if sd_booted; then
     # we moved the binary in 44-2 to /usr, so a reexec leads to a
     # coredump. refuse this reexec and warn the user that they should