[arch-commits] Commit in systemd/trunk (3 files)

[Dave Reisner]

    Date: Sunday, June 24, 2012 @ 21:10:30
  Author: dreisner
Revision: 162317

upgpkg: systemd 185-3

- move systemd-machine-id-setup to systemd-tools: this takes over for dbus-uuidgen

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd-tools.install
  systemd/trunk/systemd.install

-----------------------+
 PKGBUILD              |    5 +++--
 systemd-tools.install |    6 ++++++
 systemd.install       |    4 ----
 3 files changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-24 22:30:50 UTC (rev 162316)
+++ PKGBUILD	2012-06-25 01:10:30 UTC (rev 162317)
@@ -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 @@
   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 @@
   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

Modified: systemd-tools.install
===================================================================
--- systemd-tools.install	2012-06-24 22:30:50 UTC (rev 162316)
+++ systemd-tools.install	2012-06-25 01:10:30 UTC (rev 162317)
@@ -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."

Modified: systemd.install
===================================================================
--- systemd.install	2012-06-24 22:30:50 UTC (rev 162316)
+++ systemd.install	2012-06-25 01:10:30 UTC (rev 162317)
@@ -5,8 +5,6 @@
 }
 
 post_install() {
-  systemd-machine-id-setup
-
   # enable getty at tty1 by default, but don't track the file
   systemctl enable getty at .service
 
@@ -15,8 +13,6 @@
 }
 
 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