Skip to content

Commit 0fb06e0

Browse files
committed
cloud-hypervisor: rename doNotify to supportsNotifySocket which is used by the host nixosModule
1 parent d52082c commit 0fb06e0

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

lib/runners/cloud-hypervisor.nix

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ let
8686
};
8787

8888
# systemd>=256 hangs at stage-2 on notifying X_SYSTEMD_HOSTNAME
89-
doNotify = builtins.compareVersions pkgs.systemd.version "256" < 0;
89+
supportsNotifySocket =
90+
builtins.compareVersions pkgs.systemd.version "256" < 0;
9091

9192
in {
9293
inherit tapMultiQueue;
@@ -99,7 +100,7 @@ in {
99100
rm -f '${socket}'
100101
''}
101102
102-
'' + lib.optionalString doNotify ''
103+
'' + lib.optionalString supportsNotifySocket ''
103104
# Ensure notify sockets are removed if cloud-hypervisor didn't exit cleanly the last time
104105
rm -f notify.vsock notify.vsock_8888
105106
@@ -119,7 +120,7 @@ in {
119120
done
120121
'';
121122

122-
supportsNotifySocket = true;
123+
inherit supportsNotifySocket;
123124

124125
command =
125126
if user != null
@@ -141,7 +142,7 @@ in {
141142
"--memory" memOps
142143
]
143144
++
144-
lib.optionals doNotify [
145+
lib.optionals supportsNotifySocket [
145146
"--platform" "oem_strings=[io.systemd.credential:vmm.notify_socket=vsock-stream:2:8888]"
146147
"--vsock" "cid=3,socket=notify.vsock"
147148
]

0 commit comments

Comments
 (0)