From a896c4e31c76ad57252df5945c2634b55c926209 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Sat, 7 Oct 2023 22:23:44 +0100 Subject: [PATCH] rename wlan services for devices with > 1 radio let's standardise on having 2.4GHz radio be "wlan", and 5GHz as "wlan5" --- devices/gl-ar750/default.nix | 4 ++-- examples/rotuer.nix | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/devices/gl-ar750/default.nix b/devices/gl-ar750/default.nix index 65c6c10..2a62e88 100644 --- a/devices/gl-ar750/default.nix +++ b/devices/gl-ar750/default.nix @@ -123,11 +123,11 @@ in { lan = link.build { ifname = "eth0"; }; wan = link.build { ifname = "eth1"; }; - wlan_24 = link.build { + wlan = link.build { ifname = "wlan0"; dependencies = [ mac80211 ]; }; - wlan_5 = link.build { + wlan5 = link.build { ifname = "wlan1"; dependencies = [ mac80211 ath10k_cal_data ]; }; diff --git a/examples/rotuer.nix b/examples/rotuer.nix index 8d356b4..fc5d106 100644 --- a/examples/rotuer.nix +++ b/examples/rotuer.nix @@ -49,7 +49,7 @@ in rec { hostname = "rotuer"; services.hostap = svc.hostapd.build { - interface = config.hardware.networkInterfaces.wlan_24; + interface = config.hardware.networkInterfaces.wlan; params = { ssid = "liminix"; hw_mode="g"; @@ -59,7 +59,7 @@ in rec { }; services.hostap5 = svc.hostapd.build { - interface = config.hardware.networkInterfaces.wlan_5; + interface = config.hardware.networkInterfaces.wlan5; params = rec { ssid = "liminix_5"; hw_mode="a"; @@ -79,7 +79,9 @@ in rec { services.bridge = svc.bridge.members.build { primary = services.int; members = with config.hardware.networkInterfaces; - [ wlan_24 wlan_5 lan ]; + [ wlan + wlan5 + lan ]; }; services.ntp = svc.ntp.build {