From 061a9fb06c0dc6f8c7f39d3e78a35e8d22ad7770 Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Wed, 7 Dec 2022 22:40:42 +0200 Subject: [PATCH] net: Fix vnic name selection for LXC <=2 The "default to waydroid0" was broken as awk never returned a non-zero exit code if the file exists but no match was found. Also account for the key being named lxc.network.link on older LXC versions so one still has the ability to have a flexible Waydroid network configuration. --- data/scripts/waydroid-net.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/scripts/waydroid-net.sh b/data/scripts/waydroid-net.sh index 995177c..19d99d4 100755 --- a/data/scripts/waydroid-net.sh +++ b/data/scripts/waydroid-net.sh @@ -2,7 +2,10 @@ varrun="/run/waydroid-lxc" varlib="/var/lib" -vnic=$(awk '$1 == "lxc.net.0.link" {print $3}' /var/lib/waydroid/lxc/waydroid/config || echo "waydroid0") +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" -- 2.47.3