app_manager: Allow install/remove/list while frozen

[waydroid.git] / data / scripts / waydroid-net.sh

diff --git a/data/scripts/waydroid-net.sh b/data/scripts/waydroid-net.sh
index 14da312932ca849abb2e3f1a58e6ad9f2a43c94e..19d99d4c21581eb4af11436bdab9efa70b8bee88 100755 (executable)
--- a/data/scripts/waydroid-net.sh
+++ b/data/scripts/waydroid-net.sh
@@ -2,19 +2,30 @@
 
 varrun="/run/waydroid-lxc"
 varlib="/var/lib"
+net_link_key="lxc.net.0.link"
+case "$(lxc-info --version)" in [012].*) net_link_key="lxc.network.link" ;; esac
+vnic=$(awk "\$1 == \"$net_link_key\" {print \$3}" /var/lib/waydroid/lxc/waydroid/config)
+: ${vnic:=waydroid0}
+
+if [ "$vnic" != "waydroid0" ]; then
+    echo "vnic is $vnic, bailing out"
+    exit 0
+else 
+    echo "vnic is waydroid0"
+fi
 
 USE_LXC_BRIDGE="true"
-LXC_BRIDGE="waydroid0"
+LXC_BRIDGE="${vnic}"
 LXC_BRIDGE_MAC="00:16:3e:00:00:01"
-LXC_ADDR="192.168.250.1"
+LXC_ADDR="192.168.240.1"
 LXC_NETMASK="255.255.255.0"
-LXC_NETWORK="192.168.250.0/24"
-LXC_DHCP_RANGE="192.168.250.2,192.168.250.254"
+LXC_NETWORK="192.168.240.0/24"
+LXC_DHCP_RANGE="192.168.240.2,192.168.240.254"
 LXC_DHCP_MAX="253"
 LXC_DHCP_CONFILE=""
 LXC_DHCP_PING="true"
 LXC_DOMAIN=""
-LXC_USE_NFT="true"
+LXC_USE_NFT="false"
 
 LXC_IPV6_ADDR=""
 LXC_IPV6_MASK=""
@@ -182,6 +193,10 @@ start() {
         LXC_DHCP_PING_ARG="--no-ping"
     fi
 
+    if [ ! -d "${varlib}"/misc ]; then
+        mkdir "${varlib}"/misc
+    fi
+
     dnsmasq $LXC_DHCP_CONFILE_ARG $LXC_DOMAIN_ARG $LXC_DHCP_PING_ARG -u ${DNSMASQ_USER} \
             --strict-order --bind-interfaces --pid-file="${varrun}"/dnsmasq.pid \
             --listen-address ${LXC_ADDR} --dhcp-range ${LXC_DHCP_RANGE} \