newedge/liminix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace waitup with more generally useful ifwait

Browse Source 
* wait for $interface present before ip link set up dev
* wait for wlan0 running before adding to bridge
This commit is contained in:
Daniel Barlow
2023-03-01 17:55:52 +00:00
parent 14dacb8056
commit 626a365f79
7 changed files with 75 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rotuer.nix
View File

@@ -19,7 +19,7 @@ let
route;
inherit (pkgs.liminix.services) oneshot longrun bundle target;
inherit (pkgs)
waitup
ifwait
serviceFns
iptables;
in rec {
@@ -122,17 +122,13 @@ in rec {
};
services.bridgewlan =
let waitup-wlan = longrun {
name = "waitup-wlan0";
run = "${waitup}/bin/waitup wlan0 10";
notification-fd = 10;
dependencies = [ services.wireless services.hostap ];
};
let dev = services.wireless.device;
in oneshot {
name = "add-wlan-to-bridge";
up = "ip link set dev ${services.wireless.device} master ${services.lan.device}";
down = "ip link set dev ${services.wireless.device} nomaster";
dependencies = [ waitup-wlan ];
name = "add-wlan2-to-bridge";
up = "${ifwait}/bin/ifwait -v ${dev} running && ip link set dev ${dev} master ${services.lan.device}";
down = "ip link set dev ${dev} nomaster";
dependencies = [ services.wireless ];
};
};
users.dnsmasq = {