From 14de71f73f99d3096bda22cd2a17b360571406c6 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Mon, 2 Aug 2021 15:57:40 +0900 Subject: [PATCH] github.com/AkihiroSuda/vde_vmnet -> github.com/lima-vm/vde_vmnet Fix #9 Signed-off-by: Akihiro Suda --- .github/workflows/test.yml | 2 +- Makefile | 16 ++++++++-------- README.md | 4 ++-- ...o.github.lima-vm.vde_vmnet.bridged.en0.plist} | 2 +- ...t.plist => io.github.lima-vm.vde_vmnet.plist} | 2 +- ...tualsquare.vde-2.vde_switch.bridged.en0.plist | 2 +- ...o.github.virtualsquare.vde-2.vde_switch.plist | 2 +- main.c | 8 ++++---- 8 files changed, 19 insertions(+), 19 deletions(-) rename launchd/{io.github.AkihiroSuda.vde_vmnet.bridged.en0.plist => io.github.lima-vm.vde_vmnet.bridged.en0.plist} (93%) rename launchd/{io.github.AkihiroSuda.vde_vmnet.plist => io.github.lima-vm.vde_vmnet.plist} (93%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 77949e9..50bca58 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ jobs: - name: Install run: sudo make install - name: Print launchd status (shared mode) - run: launchctl print system/io.github.AkihiroSuda.vde_vmnet.plist + run: launchctl print system/io.github.lima-vm.vde_vmnet.plist - name: Install test dependencies run: brew install qemu bash coreutils - name: Test (shared mode) diff --git a/Makefile b/Makefile index 1efa1f4..0fe5231 100644 --- a/Makefile +++ b/Makefile @@ -25,18 +25,18 @@ install.bin: vde_vmnet install.launchd.plist: launchd/*.plist install launchd/io.github.virtualsquare.vde-2.vde_switch.plist "$(DESTDIR)/Library/LaunchDaemons/io.github.virtualsquare.vde-2.vde_switch.plist" - install launchd/io.github.AkihiroSuda.vde_vmnet.plist "$(DESTDIR)/Library/LaunchDaemons/io.github.AkihiroSuda.vde_vmnet.plist" + install launchd/io.github.lima-vm.vde_vmnet.plist "$(DESTDIR)/Library/LaunchDaemons/io.github.lima-vm.vde_vmnet.plist" ifneq ($(BRIDGED),) sed -e "s/en0/$(BRIDGED)/g" launchd/io.github.virtualsquare.vde-2.vde_switch.bridged.en0.plist > "$(DESTDIR)/Library/LaunchDaemons/io.github.virtualsquare.vde-2.vde_switch.bridged.$(BRIDGED).plist" - sed -e "s/en0/$(BRIDGED)/g" launchd/io.github.AkihiroSuda.vde_vmnet.bridged.en0.plist > "$(DESTDIR)/Library/LaunchDaemons/io.github.AkihiroSuda.vde_vmnet.bridged.$(BRIDGED).plist" + sed -e "s/en0/$(BRIDGED)/g" launchd/io.github.lima-vm.vde_vmnet.bridged.en0.plist > "$(DESTDIR)/Library/LaunchDaemons/io.github.lima-vm.vde_vmnet.bridged.$(BRIDGED).plist" endif install.launchd: install.launchd.plist launchctl load -w "$(DESTDIR)/Library/LaunchDaemons/io.github.virtualsquare.vde-2.vde_switch.plist" - launchctl load -w "$(DESTDIR)/Library/LaunchDaemons/io.github.AkihiroSuda.vde_vmnet.plist" + launchctl load -w "$(DESTDIR)/Library/LaunchDaemons/io.github.lima-vm.vde_vmnet.plist" ifneq ($(BRIDGED),) launchctl load -w "$(DESTDIR)/Library/LaunchDaemons/io.github.virtualsquare.vde-2.vde_switch.bridged.$(BRIDGED).plist" - launchctl load -w "$(DESTDIR)/Library/LaunchDaemons/io.github.AkihiroSuda.vde_vmnet.bridged.$(BRIDGED).plist" + launchctl load -w "$(DESTDIR)/Library/LaunchDaemons/io.github.lima-vm.vde_vmnet.bridged.$(BRIDGED).plist" endif install: install.bin install.launchd @@ -47,18 +47,18 @@ uninstall.bin: .PHONY: uninstall.launchd uninstall.launchd: - launchctl unload -w "$(DESTDIR)/Library/LaunchDaemons/io.github.AkihiroSuda.vde_vmnet.plist" + launchctl unload -w "$(DESTDIR)/Library/LaunchDaemons/io.github.lima-vm.vde_vmnet.plist" launchctl unload -w "$(DESTDIR)/Library/LaunchDaemons/io.github.virtualsquare.vde-2.vde_switch.plist" ifneq ($(BRIDGED),) - launchctl unload -w "$(DESTDIR)/Library/LaunchDaemons/io.github.AkihiroSuda.vde_vmnet.bridged.$(BRIDGED).plist" + launchctl unload -w "$(DESTDIR)/Library/LaunchDaemons/io.github.lima-vm.vde_vmnet.bridged.$(BRIDGED).plist" launchctl unload -w "$(DESTDIR)/Library/LaunchDaemons/io.github.virtualsquare.vde-2.vde_switch.bridged.$(BRIDGED).plist" endif uninstall.launchd.plist: uninstall.launchd - rm -f "$(DESTDIR)/Library/LaunchDaemons/io.github.AkihiroSuda.vde_vmnet.plist" + rm -f "$(DESTDIR)/Library/LaunchDaemons/io.github.lima-vm.vde_vmnet.plist" rm -f "$(DESTDIR)/Library/LaunchDaemons/io.github.virtualsquare.vde-2.vde_switch.plist" ifneq ($(BRIDGED),) - rm -f "$(DESTDIR)/Library/LaunchDaemons/io.github.AkihiroSuda.vde_vmnet.bridged.$(BRIDGED).plist" + rm -f "$(DESTDIR)/Library/LaunchDaemons/io.github.lima-vm.vde_vmnet.bridged.$(BRIDGED).plist" rm -f "$(DESTDIR)/Library/LaunchDaemons/io.github.virtualsquare.vde-2.vde_switch.bridged.$(BRIDGED).plist" endif diff --git a/README.md b/README.md index 6d29ce2..3491590 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ sudo make install The following files will be installed: - `/usr/local/bin/vde_vmnet` - `/Library/LaunchDaemons/io.github.virtualsquare.vde-2.vde_switch.plist` -- `/Library/LaunchDaemons/io.github.AkihiroSuda.vde_vmnet.plist` +- `/Library/LaunchDaemons/io.github.lima-vm.vde_vmnet.plist` - Configured to use `192.168.105.0/24`. Modifiy the file if it conflicts with your local network. See ["Testing without launchd"](#testing-without-launchd) if you don't prefer to use launchd. @@ -54,7 +54,7 @@ Run `sudo make install BRIDGED=en0`. The following additional files will be installed: - `/Library/LaunchDaemons/io.github.virtualsquare.vde-2.vde_switch.bridged.en0.plist` -- `/Library/LaunchDaemons/io.github.AkihiroSuda.vde_vmnet.bridged.en0.plist` +- `/Library/LaunchDaemons/io.github.lima-vm.vde_vmnet.bridged.en0.plist` Use `/var/run/vde.bridged.en0.ctl` as the VDE socket path. diff --git a/launchd/io.github.AkihiroSuda.vde_vmnet.bridged.en0.plist b/launchd/io.github.lima-vm.vde_vmnet.bridged.en0.plist similarity index 93% rename from launchd/io.github.AkihiroSuda.vde_vmnet.bridged.en0.plist rename to launchd/io.github.lima-vm.vde_vmnet.bridged.en0.plist index f2873b5..0c2a9fb 100644 --- a/launchd/io.github.AkihiroSuda.vde_vmnet.bridged.en0.plist +++ b/launchd/io.github.lima-vm.vde_vmnet.bridged.en0.plist @@ -4,7 +4,7 @@ Label - io.github.AkihiroSuda.vde_vmnet.bridged.en0.plist + io.github.lima-vm.vde_vmnet.bridged.en0.plist Program /usr/local/bin/vde_vmnet ProgramArguments diff --git a/launchd/io.github.AkihiroSuda.vde_vmnet.plist b/launchd/io.github.lima-vm.vde_vmnet.plist similarity index 93% rename from launchd/io.github.AkihiroSuda.vde_vmnet.plist rename to launchd/io.github.lima-vm.vde_vmnet.plist index 5a16f1a..eb250b7 100644 --- a/launchd/io.github.AkihiroSuda.vde_vmnet.plist +++ b/launchd/io.github.lima-vm.vde_vmnet.plist @@ -4,7 +4,7 @@ Label - io.github.AkihiroSuda.vde_vmnet.plist + io.github.lima-vm.vde_vmnet.plist Program /usr/local/bin/vde_vmnet ProgramArguments diff --git a/launchd/io.github.virtualsquare.vde-2.vde_switch.bridged.en0.plist b/launchd/io.github.virtualsquare.vde-2.vde_switch.bridged.en0.plist index 489ad32..aecbb03 100644 --- a/launchd/io.github.virtualsquare.vde-2.vde_switch.bridged.en0.plist +++ b/launchd/io.github.virtualsquare.vde-2.vde_switch.bridged.en0.plist @@ -3,7 +3,7 @@ - + Label io.github.virtualsquare.vde-2.vde_switch.bridged.en0.plist Program diff --git a/launchd/io.github.virtualsquare.vde-2.vde_switch.plist b/launchd/io.github.virtualsquare.vde-2.vde_switch.plist index 866ae44..0fe66a7 100644 --- a/launchd/io.github.virtualsquare.vde-2.vde_switch.plist +++ b/launchd/io.github.virtualsquare.vde-2.vde_switch.plist @@ -3,7 +3,7 @@ - + Label io.github.virtualsquare.vde-2.vde_switch.plist Program diff --git a/main.c b/main.c index 7317e95..0db36d1 100644 --- a/main.c +++ b/main.c @@ -175,8 +175,8 @@ static interface_ref start(VDECONN *vdeconn, struct cli_options *cliopt) { xpc_dictionary_set_uuid(dict, vmnet_interface_id_key, cliopt->vmnet_interface_id); - dispatch_queue_t q = dispatch_queue_create("com.example.vde_vmnet.start", - DISPATCH_QUEUE_SERIAL); + dispatch_queue_t q = dispatch_queue_create( + "io.github.lima-vm.vde_vmnet.start", DISPATCH_QUEUE_SERIAL); dispatch_semaphore_t sem = dispatch_semaphore_create(0); __block interface_ref iface; @@ -202,7 +202,7 @@ static interface_ref start(VDECONN *vdeconn, struct cli_options *cliopt) { } dispatch_queue_t event_q = dispatch_queue_create( - "com.example.vde_vmnet.events", DISPATCH_QUEUE_SERIAL); + "io.github.lima-vm.vde_vmnet.events", DISPATCH_QUEUE_SERIAL); vmnet_interface_set_event_callback( iface, VMNET_INTERFACE_PACKETS_AVAILABLE, event_q, ^(interface_event_t __attribute__((unused)) x_event_id, @@ -219,7 +219,7 @@ static void stop(interface_ref iface) { if (iface == NULL) { return; } - dispatch_queue_t q = dispatch_queue_create("com.example.vde_vmnet.stop", + dispatch_queue_t q = dispatch_queue_create("io.github.lima-vm.vde_vmnet.stop", DISPATCH_QUEUE_SERIAL); dispatch_semaphore_t sem = dispatch_semaphore_create(0); __block vmnet_return_t status;