summaryrefslogtreecommitdiff
path: root/core/systemd
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-06-28 00:01:48 +0000
committerroot <root@rshg054.dnsready.net>2012-06-28 00:01:48 +0000
commitad4cbb616af1b40790c6533f1d5b98dbd7aaa199 (patch)
treebb9eaf0dec4bf5c449ccc9236b02ea993f69f9fe /core/systemd
parent5aee7ab49f65d6fee1182bfcacf92192ad36c4af (diff)
Thu Jun 28 00:01:48 UTC 2012
Diffstat (limited to 'core/systemd')
-rw-r--r--core/systemd/PKGBUILD5
-rw-r--r--core/systemd/systemd-tools.install6
-rw-r--r--core/systemd/systemd.install4
3 files changed, 9 insertions, 6 deletions
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