File tree Expand file tree Collapse file tree 6 files changed +18
-6
lines changed Expand file tree Collapse file tree 6 files changed +18
-6
lines changed Original file line number Diff line number Diff line change 99 user
1010 vcpu mem balloon initialBalloonMem hotplugMem hotpluggedMem interfaces volumes shares devices vsock
1111 kernel initrdPath
12- storeDisk storeOnDisk ;
12+ storeDisk storeOnDisk credentialFiles ;
1313in {
1414 command =
1515 if user != null
2222 then throw "alioth does not support hotplugMem"
2323 else if hotpluggedMem != 0
2424 then throw "alioth does not support hotpluggedMem"
25+ else if credentialFiles != { }
26+ then throw "alioth does not support credentialFiles"
2527 else builtins . concatStringsSep " " (
2628 [
2729 "${ pkgs . alioth } /bin/alioth" "run"
Original file line number Diff line number Diff line change 66
77let
88 inherit ( pkgs ) lib ;
9- inherit ( microvmConfig ) vcpu mem balloon initialBalloonMem deflateOnOOM hotplugMem hotpluggedMem user interfaces volumes shares socket devices hugepageMem graphics storeDisk storeOnDisk kernel initrdPath ;
9+ inherit ( microvmConfig ) vcpu mem balloon initialBalloonMem deflateOnOOM hotplugMem hotpluggedMem user interfaces volumes shares socket devices hugepageMem graphics storeDisk storeOnDisk kernel initrdPath credentialFiles ;
1010 inherit ( microvmConfig . cloud-hypervisor ) extraArgs ;
1111
1212 kernelPath = {
132132 command =
133133 if user != null
134134 then throw "cloud-hypervisor will not change user"
135+ else if credentialFiles != { }
136+ then throw "cloud-hypervisor does not support credentialFiles"
135137 else lib . escapeShellArgs (
136138 [
137139 ( if graphics . enable
Original file line number Diff line number Diff line change 99 inherit ( pkgs . stdenv ) system ;
1010 inherit ( microvmConfig )
1111 vcpu mem balloon initialBalloonMem hotplugMem hotpluggedMem user volumes shares
12- socket devices vsock graphics
12+ socket devices vsock graphics credentialFiles
1313 kernel initrdPath storeDisk storeOnDisk ;
1414 inherit ( microvmConfig . crosvm ) pivotRoot extraArgs ;
1515
5353 then throw "crosvm does not support hotplugMem"
5454 else if hotpluggedMem != 0
5555 then throw "crosvm does not support hotpluggedMem"
56+ else if credentialFiles != { }
57+ then throw "crosvm does not support credentialFiles"
5658 else lib . escapeShellArgs (
5759 [
5860 "${ pkgs . crosvm } /bin/crosvm" "run"
Original file line number Diff line number Diff line change 1010 vcpu mem balloon initialBalloonMem hotplugMem hotpluggedMem
1111 interfaces volumes shares devices
1212 kernel initrdPath
13- storeDisk ;
13+ storeDisk credentialFiles ;
1414 inherit ( microvmConfig . firecracker ) cpu ;
1515
1616 kernelPath = {
8383 then throw "hotplugMem not implemented for Firecracker"
8484 else if hotpluggedMem != 0
8585 then throw "hotpluggedMem not implemented for Firecracker"
86+ else if credentialFiles != { }
87+ then throw "credentialFiles are not implemented for Firecracker"
8688 else lib . escapeShellArgs [
8789 "${ pkgs . firecracker } /bin/firecracker"
8890 "--config-file" configFile
Original file line number Diff line number Diff line change 88 inherit ( microvmConfig )
99 hostName preStart user
1010 vcpu mem balloon initialBalloonMem hotplugMem hotpluggedMem interfaces volumes shares devices vsock
11- kernel initrdPath
11+ kernel initrdPath credentialFiles
1212 storeDisk storeOnDisk ;
1313in {
1414 preStart = ''
2525 then throw "kvmtool does not support hotplugMem"
2626 else if hotpluggedMem != 0
2727 then throw "kvmtool does not support hotpluggedMem"
28+ else if credentialFiles != { }
29+ then throw "kvmtool does not support credentialFiles"
2830 else builtins . concatStringsSep " " (
2931 [
3032 "${ pkgs . kvmtool } /bin/lkvm" "run"
Original file line number Diff line number Diff line change 1111 inherit ( microvmConfig )
1212 hostName
1313 vcpu mem balloon initialBalloonMem hotplugMem hotpluggedMem interfaces shares socket forwardPorts devices
14- kernel initrdPath
14+ kernel initrdPath credentialFiles
1515 storeOnDisk storeDisk ;
1616
1717 tapMultiQueue = vcpu > 1 ;
7979 then throw "stratovirt does not support hotplugMem"
8080 else if hotpluggedMem != 0
8181 then throw "stratovirt does not support hotpluggedMem"
82+ else if credentialFiles != { }
83+ then throw "stratovirt does not support credentialFiles"
8284 else lib . escapeShellArgs (
8385 [
8486 "${ pkgs . expect } /bin/unbuffer"
You can’t perform that action at this time.
0 commit comments