Fri Oct 26 02:24:09 PDT 2012

1 files changed, 21 insertions, 3 deletions

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: