[arch-commits] Commit in systemd/trunk (systemd.install)

[Dave Reisner]

    Date: Tuesday, October 23, 2012 @ 17:55:45
  Author: dreisner
Revision: 169580

clean up install scriptlet

- restore reexec on upgrade
- set FS caps on systemd-detect-virt (FS#32178)

Modified:
  systemd/trunk/systemd.install

-----------------+
 systemd.install |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

Modified: systemd.install
===================================================================
--- systemd.install	2012-10-23 20:01:18 UTC (rev 169579)
+++ systemd.install	2012-10-23 21:55:45 UTC (rev 169580)
@@ -4,18 +4,28 @@
   [ -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 at tty1 by default, but don't track the file
   systemctl enable getty at .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 at tty1.service is no longer enabled by default, but we don't want to break
   # existing setups.