Rename hardware-stats service to gather-hw-info

6 files changed, 5 insertions, 7 deletions

diff --git a/core/modules/hardware-stats/data/etc/systemd/system/hardware-stats.service b/core/modules/hardware-stats/data/etc/systemd/system/gather-hw-info.service
index 386b2f62..4d782252 100644
--- a/core/modules/hardware-stats/data/etc/systemd/system/hardware-stats.service
+++ b/core/modules/hardware-stats/data/etc/systemd/system/gather-hw-info.service
@@ -4,11 +4,9 @@ Wants=tmp.target
 After=tmp.target
 # Because we might mount something to /tmp/virt there, which we use for ID44 calculation
 After=run-virt-env.service
-# This one needs the data we gather
-Before=system-check.service
 
 [Service]
 Type=oneshot
-ExecStart=/opt/openslx/scripts/systemd-hardware_stats
+ExecStart=/opt/openslx/scripts/systemd-gather_hw_info
 RemainAfterExit=yes
 
diff --git a/core/modules/hardware-stats/data/etc/systemd/system/hardware-report.service b/core/modules/hardware-stats/data/etc/systemd/system/hardware-report.service
index 1307e9e2..438225ea 100644
--- a/core/modules/hardware-stats/data/etc/systemd/system/hardware-report.service
+++ b/core/modules/hardware-stats/data/etc/systemd/system/hardware-report.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Send hardware information to boot server
-After=hardware-stats.service
-Wants=hardware-stats.service
+After=gather-hw-info.service
+Wants=gather-hw-info.service
 
 [Service]
 Type=oneshot
diff --git a/core/modules/hardware-stats/data/etc/systemd/system/multi-user.target.wants/gather-hw-info.service b/core/modules/hardware-stats/data/etc/systemd/system/multi-user.target.wants/gather-hw-info.service
new file mode 120000
index 00000000..22bee3d4
--- /dev/null
+++ b/core/modules/hardware-stats/data/etc/systemd/system/multi-user.target.wants/gather-hw-info.service
@@ -0,0 +1 @@
+../gather-hw-info.service
\ No newline at end of file
diff --git a/core/modules/hardware-stats/data/etc/systemd/system/multi-user.target.wants/hardware-stats.service b/core/modules/hardware-stats/data/etc/systemd/system/multi-user.target.wants/hardware-stats.service
deleted file mode 120000
index e463586d..00000000
--- a/core/modules/hardware-stats/data/etc/systemd/system/multi-user.target.wants/hardware-stats.service
+++ /dev/null
@@ -1 +0,0 @@
-../hardware-stats.service
\ No newline at end of file
diff --git a/core/modules/hardware-stats/data/etc/systemd/system/stats-shutdown.service b/core/modules/hardware-stats/data/etc/systemd/system/stats-shutdown.service
index 5d36034a..0f97a0bb 100644
--- a/core/modules/hardware-stats/data/etc/systemd/system/stats-shutdown.service
+++ b/core/modules/hardware-stats/data/etc/systemd/system/stats-shutdown.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Send shutdown event to boot server
 # Try this as a dedicated service in addition to the ExecStop=
-# entry in the hardware-stats.service, as that one sometimes
+# entry in the gather-hw-info.service, as that one sometimes
 # doesn't trigger/reach the server :-(
 Wants=network.target
 Before=shutdown.target
diff --git a/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats b/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-gather_hw_info
index cdeb6d63..cdeb6d63 100755
--- a/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats
+++ b/core/modules/hardware-stats/data/opt/openslx/scripts/systemd-gather_hw_info