Fri Oct 26 02:24:09 PDT 2012

2 files changed, 28 insertions, 8 deletions

diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 073d99b15..cce4b8e44 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=194
-pkgrel=4
+pkgver=195
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -18,7 +18,7 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-install-timestamp'
         '0001-Reinstate-TIMEOUT-handling.patch'
         'use-split-usr-path.patch')
-md5sums=('0ebb73aea444693b9b86f7a76f5df23c'
+md5sums=('38e8c8144e7e6e5bc3ce32eb4260e680'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          'fb37e34ea006c79be1c54cbb0f803414'
          'df69615503ad293c9ddf9d8b7755282d'
@@ -86,10 +86,12 @@ package_systemd() {
   install -dm755 "$pkgdir/bin"
   ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
 
-  # move bash-completion and symlink for loginctl
+  # move bash-completion and symlink for *ctl's
   install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
     "$pkgdir/usr/share/bash-completion/completions/systemctl"
-  ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl"
+  for ctl in {login,journal,timedate,locale,hostname}ctl; do
+    ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/$ctl"
+  done
   rm -rf "$pkgdir/etc/bash_completion.d"
 
   # don't write units to /etc by default -- we'll enable this on post_install
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install
index fa3e8f29a..aad9691b0 100644
--- a/core/systemd/systemd.install
+++ b/core/systemd/systemd.install
@@ -4,18 +4,28 @@ sd_booted() {
   [ -e sys/fs/cgroup/systemd ]
 }
 
+post_common() {
+  systemd-machine-id-setup
+
+  setcap cap_dac_override,cap_sys_ptrace+ep usr/bin/systemd-detect-virt
+
+  if sd_booted; then
+    systemctl --system daemon-reexec
+  fi
+}
+
 post_install() {
+  post_common
+
   # enable getty@tty1 by default, but don't track the file
   systemctl enable getty@.service
 
-  systemd-machine-id-setup
-
   echo ":: Append 'init=/bin/systemd' to your kernel command line in your"
   echo "   bootloader to replace sysvinit with systemd"
 }
 
 post_upgrade() {
-  systemd-machine-id-setup
+  post_common
 
   # getty@tty1.service is no longer enabled by default, but we don't want to break
   # existing setups.
@@ -29,6 +39,14 @@ post_upgrade() {
     printf '==> journald now writes to /var/log/journal by default. This can be\n'
     printf '    controlled with the Storage setting in /etc/systemd/journald.conf\n'
   fi
+
+  # logind's protocol changed. kindly restart the daemon to avoid locking
+  # out further logins.
+  if [ "$(vercmp 195 "$2")" -eq 1 ]; then
+    if sd_booted; then
+      systemctl restart systemd-logind.service
+    fi
+  fi
 }
 
 # vim:set ts=2 sw=2 et: