From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 16 Jan 2023 13:08:45 +0000 (+0200)
Subject: net: Don't fail start when already running
X-Git-Tag: 1.4.0~39
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/b910c891740026aeba2cd6a86f93ca87ef57e3c6

net: Don't fail start when already running

After 85843da (container: Make "waydroid-net.sh start" failure fatal)
this could result always failing to start unless you ran
"waydroid-net.sh stop" manually first; perhaps this should always be
stopped upon encountering errors?
---

diff --git a/data/scripts/waydroid-net.sh b/data/scripts/waydroid-net.sh
index 19d99d4..1b8a924 100755
--- a/data/scripts/waydroid-net.sh
+++ b/data/scripts/waydroid-net.sh
@@ -128,7 +128,7 @@ add rule ip lxc postrouting ip saddr ${LXC_NETWORK} ip daddr != ${LXC_NETWORK} c
 start() {
     [ "x$USE_LXC_BRIDGE" = "xtrue" ] || { exit 0; }
 
-    [ ! -f "${varrun}/network_up" ] || { echo "waydroid-net is already running"; exit 1; }
+    [ ! -f "${varrun}/network_up" ] || { echo "waydroid-net is already running"; exit 0; }
 
     if [ -d /sys/class/net/${LXC_BRIDGE} ]; then
         stop force || true