diff --git a/Makefile b/Makefile index aeb0e3c85..2c7c1dcc3 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ qemu-wrapper: .PHONY: vm vm: - GOOS=linux CGO_ENABLED=0 go build $(LDFLAGS) -o bin/vm ./cmd/vm + GOOS=linux CGO_ENABLED=0 go build $(LDFLAGS) -o bin/gvforwarder ./cmd/vm # win-sshproxy is compiled as a windows GUI to support backgrounding .PHONY: win-sshproxy diff --git a/README.md b/README.md index 599fe681f..a762f4a10 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ With a container: With the executable: ``` -(vm) # ./vm -debug +(vm) # ./gvforwarder -debug ``` ## Services diff --git a/contrib/systemd/gv-user-network@.service b/contrib/systemd/gv-user-network@.service index 1e0157121..6aefeff30 100644 --- a/contrib/systemd/gv-user-network@.service +++ b/contrib/systemd/gv-user-network@.service @@ -7,7 +7,7 @@ After=sys-devices-virtual-net-%i.device [Service] Environment=GV_VSOCK_PORT="1024" EnvironmentFile=-/etc/sysconfig/gv-user-network -ExecStart=/usr/libexec/podman/vm -preexisting -iface %i -url vsock://2:${GV_VSOCK_PORT}/connect +ExecStart=/usr/libexec/podman/gvforwarder -preexisting -iface %i -url vsock://2:${GV_VSOCK_PORT}/connect [Install] WantedBy=multi-user.target diff --git a/gvisor-tap-vsock.spec.rpkg b/gvisor-tap-vsock.spec.rpkg index e9606a5c8..d9d9efcd9 100644 --- a/gvisor-tap-vsock.spec.rpkg +++ b/gvisor-tap-vsock.spec.rpkg @@ -72,12 +72,12 @@ ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd) %gobuild -o bin/gvproxy ./cmd/gvproxy -%gobuild -o bin/vm ./cmd/vm +%gobuild -o bin/gvforwarder ./cmd/vm %install install -dp %{buildroot}%{_libexecdir}/podman install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/podman -install -p -m0755 bin/vm %{buildroot}%{_libexecdir}/podman +install -p -m0755 bin/gvforwarder %{buildroot}%{_libexecdir}/podman install -dp %{buildroot}%{_unitdir} install -p -m0644 contrib/systemd/gv-user-network@.service %{buildroot}%{_unitdir} @@ -93,7 +93,7 @@ install -p -m0644 contrib/systemd/gv-user-network@.service %{buildroot}%{_unitdi %files %dir %{_libexecdir}/podman %{_libexecdir}/podman/gvproxy -%{_libexecdir}/podman/vm +%{_libexecdir}/podman/gvforwarder %{_unitdir}/gv-user-network@.service %changelog diff --git a/images/Dockerfile b/images/Dockerfile index b4617834a..c5808e051 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -6,5 +6,5 @@ RUN make FROM busybox COPY images/udhcpc.sh /usr/share/udhcpc/default.script RUN chmod +x /usr/share/udhcpc/default.script -COPY --from=build /opt/app-root/src/bin/vm . -ENTRYPOINT ["/vm"] +COPY --from=build /opt/app-root/src/bin/gvforwarder . +ENTRYPOINT ["/gvforwarder"] diff --git a/test/wsl.sh b/test/wsl.sh index 4c335dea5..a28daf5ca 100755 --- a/test/wsl.sh +++ b/test/wsl.sh @@ -2,7 +2,7 @@ set -x -./bin/vm \ +./bin/gvforwarder \ -url="stdio:$(pwd)/bin/gvproxy-windows.exe?listen-stdio=accept&debug=true" \ -iface="eth1" \ -stop-if-exist="" \