diff options
| author | Simon Rettberg | 2022-04-21 17:44:14 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2022-04-21 17:44:14 +0200 |
| commit | e8078662e87e33f79730061708324437b0097768 (patch) | |
| tree | 050f7f0aa72b8fc8de7a8178dabf137d219dfbc1 /core | |
| parent | [vmware-common/vbox-src] Probably not depending on network.target ?? (diff) | |
| download | mltk-e8078662e87e33f79730061708324437b0097768.tar.gz mltk-e8078662e87e33f79730061708324437b0097768.tar.xz mltk-e8078662e87e33f79730061708324437b0097768.zip | |
[run-virt/hardware-stats] Move dependencies around
Diffstat (limited to 'core')
3 files changed, 8 insertions, 6 deletions
diff --git a/core/modules/hardware-stats/data/etc/systemd/system/hardware-stats.service b/core/modules/hardware-stats/data/etc/systemd/system/hardware-stats.service index 8106af74..87a43f46 100644 --- a/core/modules/hardware-stats/data/etc/systemd/system/hardware-stats.service +++ b/core/modules/hardware-stats/data/etc/systemd/system/hardware-stats.service @@ -1,6 +1,6 @@ [Unit] Description=Gather hardware information about this machine -After=tmp.target mount-vm-store.service network.target run-virt-env.service +After=tmp.target Wants=tmp.target system-check.service Before=system-check.service diff --git a/core/modules/run-virt/data/etc/systemd/system/system-check.service.d/50-run-virt-deps.conf b/core/modules/run-virt/data/etc/systemd/system/system-check.service.d/50-run-virt-deps.conf new file mode 100644 index 00000000..e5543f6f --- /dev/null +++ b/core/modules/run-virt/data/etc/systemd/system/system-check.service.d/50-run-virt-deps.conf @@ -0,0 +1,3 @@ +[Unit] +# our system-check hook needs stuff from these +After=run-virt-env.service mount-vm-store.service diff --git a/core/modules/run-virt/data/opt/openslx/system-check/hooks.d/30-run-virt b/core/modules/run-virt/data/opt/openslx/system-check/hooks.d/30-run-virt index 2621ec83..5285009e 100755 --- a/core/modules/run-virt/data/opt/openslx/system-check/hooks.d/30-run-virt +++ b/core/modules/run-virt/data/opt/openslx/system-check/hooks.d/30-run-virt @@ -15,19 +15,18 @@ elif [ "$HW_KVM" = "UNSUPPORTED" ]; then fi if [ -n "$HW_MBRAM" ] && [ "$HW_MBRAM" -lt 3400 ]; then - GB=$(( ( HW_MBRAM + 300 ) / 1024 )) + GB=$(( ( HW_MBRAM + 300 ) / 1024 )) echo "slx-virt-lowmemory|${GB}" fi -if [ -n "$SLX_VM_NFS" ] && ! systemctl status mount-vm-store >/dev/null; then +if [ -n "$SLX_VM_NFS" ] && systemctl is-failed mount-vm-store.service; then echo 'slx-virt-vmstore-fail' fi -# TODO: when native sessions will be rolled out, we should always -# check if an ID44 partition is present (to back the base OS). +# Jambo-specific: They mount an NFS share here, so no ID44 doesn't matter if fs_path_ismountpoint /tmp/virt; then exit 0 -fi +fi if [ "$HW_ID44" = "0" ]; then echo 'slx-virt-noid44' |