launchd: support vde_switch >= 2014-01-15

Workaround for virtualsquare/vde-2 issue 30 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
lima-vm · Aug 25, 2021 · 803308b · 803308b
1 parent a5fdfe1
commit 803308b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 20 deletions.
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
@@ -7,18 +7,14 @@
 		<key>Label</key>
 		<string>io.github.virtualsquare.vde-2.vde_switch.bridged.en0.plist</string>
 		<key>Program</key>
-		<string>/usr/local/bin/vde_switch</string>
+		<string>/bin/sh</string>
 		<key>ProgramArguments</key>
 		<array>
-			<string>/usr/local/bin/vde_switch</string>
-			<string>--sock</string>
-			<string>/var/run/vde.bridged.en0.ctl</string>
-			<string>--pidfile</string>
-			<string>/var/run/vde.bridged.en0.pid</string>
-			<string>--group</string>
-			<string>staff</string>
-			<string>--dirmode</string>
-			<string>0770</string>
+			<!-- vde_switch requires "daemon" flag for non-tty mode since 2014: https://github.com/virtualsquare/vde-2/issues/30 -->
+			<!-- we use `tail -f /dev/null` to keep the launchd job active -->
+			<string>/bin/sh</string>
+			<string>-euc</string>
+      <string>/usr/local/bin/vde_switch --daemon --sock=/var/run/vde.bridged.en0.ctl --pidfile=/var/run/vde.bridged.en0.pid --group=staff --dirmode=0770 &amp;&amp; trap 'kill $(cat /var/run/vde.pid)' EXIT ; tail -f /dev/null</string>
 		</array>
 		<key>StandardErrorPath</key>
 		<string>/var/run/vde.bridged.en0.stderr</string>

diff --git a/launchd/io.github.virtualsquare.vde-2.vde_switch.plist b/launchd/io.github.virtualsquare.vde-2.vde_switch.plist
@@ -7,18 +7,14 @@
 		<key>Label</key>
 		<string>io.github.virtualsquare.vde-2.vde_switch.plist</string>
 		<key>Program</key>
-		<string>/usr/local/bin/vde_switch</string>
+		<string>/bin/sh</string>
 		<key>ProgramArguments</key>
 		<array>
-			<string>/usr/local/bin/vde_switch</string>
-			<string>--sock</string>
-			<string>/var/run/vde.ctl</string>
-			<string>--pidfile</string>
-			<string>/var/run/vde.pid</string>
-			<string>--group</string>
-			<string>staff</string>
-			<string>--dirmode</string>
-			<string>0770</string>
+			<!-- vde_switch requires "daemon" flag for non-tty mode since 2014: https://github.com/virtualsquare/vde-2/issues/30 -->
+			<!-- we use `tail -f /dev/null` to keep the launchd job active -->
+			<string>/bin/sh</string>
+			<string>-euc</string>
+      <string>/usr/local/bin/vde_switch --daemon --sock=/var/run/vde.ctl --pidfile=/var/run/vde.pid --group=staff --dirmode=0770 &amp;&amp; trap 'kill $(cat /var/run/vde.pid)' EXIT ; tail -f /dev/null</string>
 		</array>
 		<key>StandardErrorPath</key>
 		<string>/var/run/vde.stderr</string>