[Lunar-commits] <moonbase-core> systemd: Corrected an issue introduced in the last systemd.plugin commit

[Stefan Wold]

commit fd2a1631f3d18216f7d56334944642507d472ab9
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Mon, 07 Oct 2013 11:46:03 -0700
URL: https://github.com/lunar-linux/moonbase-core/commit/fd2a1631f3d18216f7d56334944642507d472ab9

systemd: Corrected an issue introduced in the last systemd.plugin commit

Installwatch log is no longer around during BUILD_POST_INSTALL stage which
meant unit files was not properly tracked with the introduced change. The
fix was to split out the daemon restart part into its own function which
then is properly called in BUILD_POST_INSTALL. Installation and
enabling of services is once again running in BUILD_POST_BUILD stage.
---
  system/systemd/plugin.d/systemd.plugin | +17/-5    
  1 file changed, 17 insertions(+), 5 deletions(-)

--- a/system/systemd/plugin.d/systemd.plugin
+++ b/system/systemd/plugin.d/systemd.plugin
@@ -71,7 +71,7 @@ plugin_systemd_configure()
 }
 
 
-plugin_systemd_post_install()
+plugin_systemd_post_build()
 {
   local SERVICES SERVICE SYSTEMDUNITDIR
   debug_msg "plugin_systemd_post_install ($@)"
@@ -101,17 +101,28 @@ plugin_systemd_post_install()
     invoke_installwatch
     systemctl -q enable $SERVICE
     devoke_installwatch
+  done
+
+  return 2
+}
+
+plugin_systemd_restart_services() {
+  local SERVICE
+  debug_msg "plugin_systemd_restart_services ($@)"
 
-    # start-or-restart it
+  # start-or-restart it
+  for SERVICE in $SYSTEMD_SERVICES; do
+    if echo $SERVICE | grep -q ^-; then
+      continue;
+    fi
     if [ "${LUNAR_RESTART_SERVICES:=on}" == "on" ]; then
       systemctl restart $SERVICE
     fi
-
   done
+
   return 2
 }
 
-
 plugin_systemd_tmpfilesd_post_build() {
   local FILE SYSTEMDTEMPFILES
   debug_msg "plugin_systemd_tmpfilesd_post_build ($@)"
@@ -148,6 +159,7 @@ plugin_systemd_disable_services_pre_remove() {
 }
 
 plugin_register BUILD_CONFIGURE plugin_systemd_configure
-plugin_register BUILD_POST_INSTALL plugin_systemd_post_install
+plugin_register BUILD_POST_BUILD plugin_systemd_post_build
 plugin_register BUILD_POST_BUILD plugin_systemd_tmpfilesd_post_build
+plugin_register BUILD_POST_INSTALL plugin_systemd_restart_services
 plugin_register BUILD_PRE_REMOVE plugin_systemd_disable_services_pre_remove