@@ -117,22 +117,24 @@ If any private key under ~/.ssh is protected with a passphrase, you need to have
117
117
if * a .instConfig .Plain {
118
118
return req
119
119
}
120
- req = append (req ,
121
- requirement {
122
- description : "user session is ready for ssh" ,
123
- script : `#!/bin/bash
120
+ if * a .y .VMType != limayaml .EXT {
121
+ req = append (req ,
122
+ requirement {
123
+ description : "user session is ready for ssh" ,
124
+ script : `#!/bin/bash
124
125
set -eux -o pipefail
125
126
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
126
127
echo >&2 "not ready to start persistent ssh session"
127
128
exit 1
128
129
fi
129
130
` ,
130
- debugHint : `The boot sequence will terminate any existing user session after updating
131
+ debugHint : `The boot sequence will terminate any existing user session after updating
131
132
/etc/environment to make sure the session includes the new values.
132
133
Terminating the session will break the persistent SSH tunnel, so
133
134
it must not be created until the session reset is done.
134
135
` ,
135
- })
136
+ })
137
+ }
136
138
137
139
if * a .instConfig .MountType == limayaml .REVSSHFS && len (a .instConfig .Mounts ) > 0 {
138
140
req = append (req , requirement {
@@ -214,20 +216,22 @@ Also see "/var/log/cloud-init-output.log" in the guest.
214
216
215
217
func (a * HostAgent ) finalRequirements () []requirement {
216
218
req := make ([]requirement , 0 )
217
- req = append (req ,
218
- requirement {
219
- description : "boot scripts must have finished" ,
220
- script : `#!/bin/bash
219
+ if * a .y .VMType != limayaml .EXT {
220
+ req = append (req ,
221
+ requirement {
222
+ description : "boot scripts must have finished" ,
223
+ script : `#!/bin/bash
221
224
set -eux -o pipefail
222
225
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
223
226
echo >&2 "boot scripts have not finished"
224
227
exit 1
225
228
fi
226
229
` ,
227
- debugHint : `All boot scripts, provisioning scripts, and readiness probes must
230
+ debugHint : `All boot scripts, provisioning scripts, and readiness probes must
228
231
finish before the instance is considered "ready".
229
232
Check "/var/log/cloud-init-output.log" in the guest to see where the process is blocked!
230
233
` ,
231
- })
234
+ })
235
+ }
232
236
return req
233
237
}
0 commit comments