From 9d618470521325b11ac21a96104876136f96df45 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 28 Feb 2019 12:31:05 +0100
Subject: [hardware-stats] Fiddle with service file again

---
 .../hardware-stats/data/etc/systemd/system/shutdown-usage-log.service | 4 +++-
 .../hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats    | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/modules/hardware-stats/data/etc/systemd/system/shutdown-usage-log.service b/core/modules/hardware-stats/data/etc/systemd/system/shutdown-usage-log.service
index e91c6db6..7143a597 100644
--- a/core/modules/hardware-stats/data/etc/systemd/system/shutdown-usage-log.service
+++ b/core/modules/hardware-stats/data/etc/systemd/system/shutdown-usage-log.service
@@ -2,11 +2,13 @@
 Description=Tell server we're shutting down
 DefaultDependencies=no
 Before=shutdown.target
+Requires=network-online.target
 After=-.mount network-online.target
 RefuseManualStart=yes
 
 [Service]
 Type=oneshot
-ExecStart=/opt/openslx/scripts/shutdown-system_usage_update
+ExecStartPre=/opt/openslx/scripts/shutdown-system_usage_update
+ExecStart=/bin/true
 RemainAfterExit=yes
 
diff --git a/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats b/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
index 76adb3d4..55c9dfa8 100755
--- a/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
+++ b/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
@@ -361,6 +361,8 @@ if curl --retry 4 --retry-connrefused \
 	touch "/etc/cron.d" # Sometimes, aufs doesn't update the mtime of dirs when creating files,
 	# so cron would not rescan the cron directory
 	cleanup
+	# Trigger right now so resource usage gets updated
+	/opt/openslx/scripts/cron-system_usage_update
 	exit 0
 else
 	echo "Failed..."
-- 
cgit v1.2.3-55-g7522