diff options
| author | Simon Rettberg | 2024-01-29 12:07:05 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2024-01-29 12:07:05 +0100 |
| commit | 22030186cad0cd9477980006feb4180b9f13b14d (patch) | |
| tree | c92383576691bf83b4976f1ddac972a1a9ba9e70 /core | |
| parent | [dhcpc-busybox] Remove check for non-existent var (diff) | |
| download | mltk-22030186cad0cd9477980006feb4180b9f13b14d.tar.gz mltk-22030186cad0cd9477980006feb4180b9f13b14d.tar.xz mltk-22030186cad0cd9477980006feb4180b9f13b14d.zip | |
Rename hardware-stats service to gather-hw-info
Diffstat (limited to 'core')
| -rw-r--r-- | core/modules/hardware-stats/data/etc/systemd/system/gather-hw-info.service (renamed from core/modules/hardware-stats/data/etc/systemd/system/hardware-stats.service) | 4 | ||||
| -rw-r--r-- | core/modules/hardware-stats/data/etc/systemd/system/hardware-report.service | 4 | ||||
| l--------- | core/modules/hardware-stats/data/etc/systemd/system/multi-user.target.wants/gather-hw-info.service | 1 | ||||
| l--------- | core/modules/hardware-stats/data/etc/systemd/system/multi-user.target.wants/hardware-stats.service | 1 | ||||
| -rw-r--r-- | core/modules/hardware-stats/data/etc/systemd/system/stats-shutdown.service | 2 | ||||
| -rwxr-xr-x | core/modules/hardware-stats/data/opt/openslx/scripts/systemd-gather_hw_info (renamed from core/modules/hardware-stats/data/opt/openslx/scripts/systemd-hardware_stats) | 0 | ||||
| -rw-r--r-- | core/modules/lightdm/data/etc/systemd/system/lightdm.service | 1 | ||||
| -rw-r--r-- | core/modules/system-check/data/etc/systemd/system/system-check.service | 2 |
8 files changed, 7 insertions, 8 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 diff --git a/core/modules/lightdm/data/etc/systemd/system/lightdm.service b/core/modules/lightdm/data/etc/systemd/system/lightdm.service index 90dfb042..4b719863 100644 --- a/core/modules/lightdm/data/etc/systemd/system/lightdm.service +++ b/core/modules/lightdm/data/etc/systemd/system/lightdm.service @@ -1,6 +1,7 @@ [Unit] Description=LightDM Display Manager Conflicts=getty@tty7.service +Wants=system-check.service After=dev-tty7.device systemd-user-sessions.service load-gfx-driver.service After=setup-slx-addon@vmware.service setup-slx-addon@virtualbox.service # So the hostname won't change later on an mess up X11 access diff --git a/core/modules/system-check/data/etc/systemd/system/system-check.service b/core/modules/system-check/data/etc/systemd/system/system-check.service index 76887195..9c396f3f 100644 --- a/core/modules/system-check/data/etc/systemd/system/system-check.service +++ b/core/modules/system-check/data/etc/systemd/system/system-check.service @@ -3,7 +3,7 @@ Description=Report system checks Before=display-manager.service Wants=network-online.target After=network-online.target -After=hardware-stats.service +After=gather-hw-info.service [Service] Type=oneshot |