diff --git a/pkgs/ch-proxy/proxy.c b/pkgs/ch-proxy/proxy.c index 74f4f32..78bfefd 100644 --- a/pkgs/ch-proxy/proxy.c +++ b/pkgs/ch-proxy/proxy.c @@ -41,7 +41,7 @@ char *extract_uvm(const char *host_string) { } char *result; - if (asprintf(&result, "%s/uvms/%s/CONNECT.sock", home, &host_string[PREFIX_LEN]) == -1) { + if (asprintf(&result, "%s/uvms/%s/vsock.sock", home, &host_string[PREFIX_LEN]) == -1) { perror("ch-proxy/extract_uvm"); exit(EXIT_FAILURE); } @@ -59,7 +59,7 @@ char *extract_muvm(const char *host_string) { } char *result; - if (asprintf(&result, "/var/lib/microvms/%s/CONNECT.sock", &host_string[PREFIX_LEN]) == -1) { + if (asprintf(&result, "/var/lib/microvms/%s/vsock.sock", &host_string[PREFIX_LEN]) == -1) { perror("ch-proxy/extract_muvm"); exit(EXIT_FAILURE); } diff --git a/profiles/ch-runner.nix b/profiles/ch-runner.nix index de0dab9..fbb09a4 100644 --- a/profiles/ch-runner.nix +++ b/profiles/ch-runner.nix @@ -51,8 +51,8 @@ in "--cmdline=${lib.concatStringsSep " " cfg.cmdline}" "--kernel=${config.boot.kernelPackages.kernel}/${pkgs.stdenv.hostPlatform.linux-kernel.target}" "--initramfs=${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}" - "--vsock=cid=4,socket=CONNECT.sock" - "--api-socket=ch.sock" + "--vsock=cid=4,socket=vsock.sock" + "--api-socket=vmm.sock" "--serial=tty" "--console=null" "--watchdog" @@ -69,7 +69,7 @@ in mkdir -p "$HOME/uvms/$GUESTNAME" cd "$HOME/uvms/$GUESTNAME" cleanup() { - rm "$HOME/uvms/$GUESTNAME"/{ch,CONNECT}.sock + rm "$HOME/uvms/$GUESTNAME"/{vmm,vsock}.sock } exec -a "uuvm/$GUESTNAME" "''${args[@]}" ''; diff --git a/profiles/uvms-guest.nix b/profiles/uvms-guest.nix index f55e1af..e8c307d 100644 --- a/profiles/uvms-guest.nix +++ b/profiles/uvms-guest.nix @@ -54,8 +54,8 @@ in ]; systemd.services."microvm@".serviceConfig.ExecStartPost = [ (pkgs.writeShellScript "microvm-fix-umask" '' - if [[ -e CONNECT.sock ]] ; then - chmod g+rw CONNECT.sock + if [[ -e vsock.sock ]] ; then + chmod g+rw vsock.sock fi '') ]; diff --git a/profiles/vsock-connect-guest.nix b/profiles/vsock-connect-guest.nix index 823f990..13b7b13 100644 --- a/profiles/vsock-connect-guest.nix +++ b/profiles/vsock-connect-guest.nix @@ -12,7 +12,7 @@ in (mkIfGuest { microvm.cloud-hypervisor.extraArgs = [ "--vsock" - "cid=4,socket=CONNECT.sock" + "cid=4,socket=vsock.sock" ]; }) {