File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change 43
43
userVSockPath = extractParamValue "socket" userVSockStr ;
44
44
userVSockCID = extractParamValue "cid" userVSockStr ;
45
45
vsockCID = if vsock . cid != null && userVSockCID != null
46
- then throw "Cannot set `microvm.vsock.cid` and --vsock 'cid=${ userVSockCID } ...' from `microvm.cloud-hypervisor.extraArgs` at the same time"
46
+ then throw "Cannot set `microvm.vsock.cid` and --vsock 'cid=${ userVSockCID } ...' via `microvm.cloud-hypervisor.extraArgs` at the same time"
47
47
else if vsock . cid != null
48
48
then vsock . cid
49
49
else userVSockCID ;
131
131
platformExtracted = extractOptValues "--platform" extraArgs ;
132
132
extraArgsWithoutPlatform = platformExtracted . args ;
133
133
userPlatformOpts = platformExtracted . values ;
134
- userPlatformStr = if userPlatformOpts == [ ] then "" else builtins . head userPlatformOpts ;
134
+ userPlatformStr = lib . optionalString ( userPlatformOpts != [ ] ) ( builtins . head userPlatformOpts ) ;
135
135
userHasOemStrings = ( extractParamValue "oem_strings" userPlatformStr ) != null ;
136
136
platformOps =
137
137
if userHasOemStrings then
You can’t perform that action at this time.
0 commit comments