@@ -131,22 +131,24 @@ If any private key under ~/.ssh is protected with a passphrase, you need to have
131
131
if * a .instConfig .Plain {
132
132
return req
133
133
}
134
- req = append (req ,
135
- requirement {
136
- description : "user session is ready for ssh" ,
137
- script : `#!/bin/bash
134
+ if * a .y .VMType != limayaml .EXT {
135
+ req = append (req ,
136
+ requirement {
137
+ description : "user session is ready for ssh" ,
138
+ script : `#!/bin/bash
138
139
set -eux -o pipefail
139
140
if ! timeout 30s bash -c "until sudo diff -q /run/lima-ssh-ready /mnt/lima-cidata/meta-data 2>/dev/null; do sleep 3; done"; then
140
141
echo >&2 "not ready to start persistent ssh session"
141
142
exit 1
142
143
fi
143
144
` ,
144
- debugHint : `The boot sequence will terminate any existing user session after updating
145
+ debugHint : `The boot sequence will terminate any existing user session after updating
145
146
/etc/environment to make sure the session includes the new values.
146
147
Terminating the session will break the persistent SSH tunnel, so
147
148
it must not be created until the session reset is done.
148
149
` ,
149
- })
150
+ })
151
+ }
150
152
151
153
if * a .instConfig .MountType == limayaml .REVSSHFS && len (a .instConfig .Mounts ) > 0 {
152
154
req = append (req , requirement {
@@ -228,20 +230,22 @@ Also see "/var/log/cloud-init-output.log" in the guest.
228
230
229
231
func (a * HostAgent ) finalRequirements () []requirement {
230
232
req := make ([]requirement , 0 )
231
- req = append (req ,
232
- requirement {
233
- description : "boot scripts must have finished" ,
234
- script : `#!/bin/bash
233
+ if * a .y .VMType != limayaml .EXT {
234
+ req = append (req ,
235
+ requirement {
236
+ description : "boot scripts must have finished" ,
237
+ script : `#!/bin/bash
235
238
set -eux -o pipefail
236
239
if ! timeout 30s bash -c "until sudo diff -q /run/lima-boot-done /mnt/lima-cidata/meta-data 2>/dev/null; do sleep 3; done"; then
237
240
echo >&2 "boot scripts have not finished"
238
241
exit 1
239
242
fi
240
243
` ,
241
- debugHint : `All boot scripts, provisioning scripts, and readiness probes must
244
+ debugHint : `All boot scripts, provisioning scripts, and readiness probes must
242
245
finish before the instance is considered "ready".
243
246
Check "/var/log/cloud-init-output.log" in the guest to see where the process is blocked!
244
247
` ,
245
- })
248
+ })
249
+ }
246
250
return req
247
251
}
0 commit comments