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

[Christian Hesse]

    Date: Thursday, July 6, 2017 @ 11:27:57
  Author: eworm
Revision: 299757

handle dots in pkgver, reenable systemd-resolved on upgrade

Modified:
  systemd/trunk/systemd.install

-----------------+
 systemd.install |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Modified: systemd.install
===================================================================
--- systemd.install	2017-07-06 11:14:15 UTC (rev 299756)
+++ systemd.install	2017-07-06 11:27:57 UTC (rev 299757)
@@ -45,6 +45,14 @@
   fi
 }
 
+_233_75_3_changes() {
+  # upstream installs services to /etc, which we remove
+  # to keep bus activation we re-enable systemd-resolved
+  if systemctl is-enabled -q systemd-resolved.service; then
+    systemctl reenable -q systemd-resolved.service
+  fi
+}
+
 post_install() {
   systemd-machine-id-setup
 
@@ -78,11 +86,12 @@
     219-4
     230-1
     232-8
+    233.75-3
   )
 
   for v in "${upgrades[@]}"; do
     if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
-      "_${v//-/_}_changes"
+      "_${v//[.-]/_}_changes"
     fi
   done
 }