From 551f25208f18830878c8ab20ab8d76d595197633 Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Fri, 3 Aug 2018 17:11:57 +0200 Subject: [PATCH 1/2] scripts: if running inside the snap don't use /run --- scripts/anbox-bridge.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/anbox-bridge.sh b/scripts/anbox-bridge.sh index 46f34b7..c346404 100755 --- a/scripts/anbox-bridge.sh +++ b/scripts/anbox-bridge.sh @@ -18,6 +18,10 @@ varrun="/run/anbox" +if [ -n "$SNAP_DATA" ]; then + varrun="$SNAP_DATA"/network +fi + BRIDGE="anbox0" # IPv4 From 81c90ab2184e57b4c6659c169df0999c67bf6939 Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Fri, 3 Aug 2018 17:12:18 +0200 Subject: [PATCH 2/2] scripts: expose bridge configuration via the snap config system --- scripts/anbox-bridge.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/scripts/anbox-bridge.sh b/scripts/anbox-bridge.sh index c346404..7cf2cea 100755 --- a/scripts/anbox-bridge.sh +++ b/scripts/anbox-bridge.sh @@ -30,6 +30,25 @@ IPV4_NETMASK="255.255.255.0" IPV4_NETWORK="192.168.250.1/24" IPV4_NAT="true" +if [ -n "$SNAP" ]; then + snap_ipv4_address=$(snapctl get bridge.address) + snap_ipv4_netmask=$(snapctl get bridge.netmask) + snap_ipv4_network=$(snapctl get bridge.network) + snap_enable_nat=$(snapctl get bridge.nat.enable) + if [ -n "$snap_ipv4_address" ]; then + IPV4_ADDR="$snap_ipv4_address" + fi + if [ -n "$snap_ipv4_netmask" ]; then + IPV4_NETMASK="$snap_ipv4_netmask" + fi + if [ -n "$snap_ipv4_network" ]; then + IPV4_NETWORK="$snap_ipv4_network" + fi + if [ "$snap_enable_nat" = false ]; then + IPV4_NAT="false" + fi +fi + use_iptables_lock="-w" iptables -w -L -n > /dev/null 2>&1 || use_iptables_lock=""