diff --git a/.env b/.env index 832cac4..6e0e11c 100644 --- a/.env +++ b/.env @@ -6,8 +6,7 @@ CONTAINER=openwrt_1 WAN_NAME=openwrt-wan WAN_PARENT=enp0s20f0u4 WAN_SUBNET=192.168.12.0/24 -# lan (note the VLAN tag - LAN_PARENT must be different from WAN_PARENT) -LAN_PARENT=enp0s20f0u4.16 + LAN_NAME=openwrt-lan LAN_SUBNET=192.168.16.0/24 LAN_ADDR=192.168.16.1 diff --git a/run.sh b/run.sh index e0494bb..ff0bb43 100755 --- a/run.sh +++ b/run.sh @@ -40,18 +40,17 @@ function _gen_config { function _init_network { echo "* setting up docker network" - docker network create --driver macvlan \ - -o parent=$LAN_PARENT \ + LAN_ID=$(docker network create --driver macvlan \ --subnet $LAN_SUBNET \ --aux-address host=$LAN_HOST \ - $LAN_NAME + $LAN_NAME) - docker network create --driver macvlan \ + WAN_ID=$(docker network create --driver macvlan \ -o parent=$WAN_PARENT \ --subnet $WAN_SUBNET \ - $WAN_NAME + $WAN_NAME) - sudo ip link add macvlan0 link $LAN_PARENT type macvlan mode bridge + sudo ip link add macvlan0 link "dm-${LAN_ID:0:12}" type macvlan mode bridge sudo ip addr add $LAN_HOST/24 dev macvlan0 sudo ip link set macvlan0 up sudo ip route add $LAN_SUBNET dev macvlan0