else/uvms
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ch-runner: drop passt from the PoC

Browse source
This commit is contained in:
Else Someone 2026-02-12 22:22:06 +02:00
parent 17bde34c96
commit ee497cb7d6
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
profiles/ch-runner.nix
View file

@ -28,8 +28,6 @@ let
uvmPrefix = "\${HOME}/uvms/${hostName}"; uvmPrefix = "\${HOME}/uvms/${hostName}";
vmmSock = "${uvmPrefix}/vmm.sock"; vmmSock = "${uvmPrefix}/vmm.sock";
pastaSock = "${uvmPrefix}/pasta.sock";
pastaPidPath = "${uvmPrefix}/pasta.pid";
elbPrefix = "${lib.getBin pkgs.execline}/bin"; elbPrefix = "${lib.getBin pkgs.execline}/bin";
s6Prefix = "${lib.getBin pkgs.s6}/bin"; s6Prefix = "${lib.getBin pkgs.s6}/bin";
writeElb = name: text: writeElb' name "-W" text; writeElb = name: text: writeElb' name "-W" text;
@ -280,13 +278,6 @@ in
exec -a "uuvm/${hostName} cloud-hypervisor" $CH --api-socket fd=3 exec -a "uuvm/${hostName} cloud-hypervisor" $CH --api-socket fd=3
} }
importas CH_PID ! importas CH_PID !
background {
s6-ipcserver-socketbinder -B ${pastaSock}
s6-ipcserverd
trap { default { foreground { s6-ipcclient -q ${uvmPrefix}/cleanup.sock true } exit } }
exec -a "uuvm/${hostName} passt" $PASST --vhost-user -fF 0
}
importas PASST_PID !
background { background {
getpid -E CLEANUP_PID getpid -E CLEANUP_PID
s6-ipcserver-socketbinder -B "${uvmPrefix}/cleanup.sock" s6-ipcserver-socketbinder -B "${uvmPrefix}/cleanup.sock"
@ -299,7 +290,6 @@ in
} }
trap { default { foreground { s6-ipcclient -q ${uvmPrefix}/cleanup.sock true } exit } } trap { default { foreground { s6-ipcclient -q ${uvmPrefix}/cleanup.sock true } exit } }
if { $CHR create ${chSettingsFile} } if { $CHR create ${chSettingsFile} }
# if { $CHR add-net "vhost_user=on,socket=${pastaSock}" }
if { ${lib.getExe uvmsPkgs.taps} pass $CHR add-net "id=wan,fd=3,mac=00:00:00:00:00:01" } if { ${lib.getExe uvmsPkgs.taps} pass $CHR add-net "id=wan,fd=3,mac=00:00:00:00:00:01" }
if { $CHR boot } if { $CHR boot }
if { $CHR info } if { $CHR info }