Skip to content

Commit

Permalink
build: Rename vm to gvforwarder
Browse files Browse the repository at this point in the history
This aligns the naming with 'gvproxy' and hopefully makes it a bit more
descriptive

Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
  • Loading branch information
cfergeau committed Apr 21, 2023
1 parent 7dc0547 commit 61fa4b2
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ With a container:

With the executable:
```
(vm) # ./vm -debug
(vm) # ./gvforwarder -debug
```

## Services
Expand Down
2 changes: 1 addition & 1 deletion contrib/systemd/gv-user-network@.service
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions gvisor-tap-vsock.spec.rpkg
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,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 -p -m0644 contrib/systemd/gv-user-network@.service %{buildroot}%{_unitdir}

%post
Expand All @@ -90,7 +90,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
Expand Down
4 changes: 2 additions & 2 deletions images/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion test/wsl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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="" \
Expand Down

0 comments on commit 61fa4b2

Please sign in to comment.