diff --git a/src/run_openwrt.sh b/src/run_openwrt.sh index 10b3e05..4098873 100755 --- a/src/run_openwrt.sh +++ b/src/run_openwrt.sh @@ -176,7 +176,7 @@ LAN_IF_OPTION=$(echo $LAN_IF | cut -d',' -f2) if [[ -z "${LAN_IF_NAME}" || $LAN_IF_NAME = "host" ]]; then LAN_ARGS="-device virtio-net,netdev=qlan0 -netdev user,id=qlan0,net=192.168.1.0/24" elif [[ $LAN_IF_NAME = "veth" ]]; then - attach_veth_if veth-openwrt0 veth1 qlan1 $LAN_IF_OPTION + attach_veth_if env-openwrt0 veth1 qlan1 $LAN_IF_OPTION exec 30<>/dev/tap$(cat /sys/class/net/qlan1/ifindex) LAN_ARGS="-device virtio-net-pci,netdev=hostnet0,mac=$(cat /sys/class/net/qlan1/address) \ -netdev tap,fd=30,id=hostnet0" diff --git a/test/tests/openwrt_docker_test.py b/test/tests/openwrt_docker_test.py index 16786b7..cd76714 100644 --- a/test/tests/openwrt_docker_test.py +++ b/test/tests/openwrt_docker_test.py @@ -273,7 +273,7 @@ def test_openwrt_lan(docker_services, parameter): case 'veth,nofixedip': # Get all IPv4 addresses - process = subprocess.run(['sh','-c',r'ip addr show veth-openwrt0 | grep -oP "(?<=inet\s)\d+(\.\d+){3}"'], + process = subprocess.run(['sh','-c',r'ip addr show env-openwrt0 | grep -oP "(?<=inet\s)\d+(\.\d+){3}"'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) diff --git a/web-frontend/src/app/side-navigation/side-navigation.component.ts b/web-frontend/src/app/side-navigation/side-navigation.component.ts index 2e6c459..b0086e8 100644 --- a/web-frontend/src/app/side-navigation/side-navigation.component.ts +++ b/web-frontend/src/app/side-navigation/side-navigation.component.ts @@ -37,7 +37,7 @@ export class SideNavigationComponent { LuciButtonUrl: string = "https://" + window.location.hostname + ":9000"; // ToDo make port 9000 configurable LuciButtonTooltip: string = 'Requirements: LAN="veth", FORWARD_LUCI="true", \ default OpenWrt DHCP LAN settings, \ - configured "veth-openwrt0" Ethernet interface in host system. \ + configured "env-openwrt0" Ethernet interface in host system. \ Internally a reverse proxy is forwarding the web interface from "host-ip:9000" to "172.31.1.1:80"'; private breakpointObserver = inject(BreakpointObserver);