diff options
| author | Ankit Pandey <pandeyan@grinnell.edu> | 2021-08-01 13:40:06 -0500 |
|---|---|---|
| committer | Ankit Pandey <pandeyan@grinnell.edu> | 2021-08-01 13:46:57 -0500 |
| commit | 910f233fb7120c51cb8cbbaed4fab4caa6e5d751 (patch) | |
| tree | f65638b271d65653cf634e5505d3a397f4d790ae /nixos/modules/programs/captive-browser.nix | |
| parent | 9fc2cddf24ad1819f17174cbae47789294ea6dc4 (diff) | |
| download | nixpkgs-910f233fb7120c51cb8cbbaed4fab4caa6e5d751.tar nixpkgs-910f233fb7120c51cb8cbbaed4fab4caa6e5d751.tar.gz nixpkgs-910f233fb7120c51cb8cbbaed4fab4caa6e5d751.tar.bz2 nixpkgs-910f233fb7120c51cb8cbbaed4fab4caa6e5d751.tar.lz nixpkgs-910f233fb7120c51cb8cbbaed4fab4caa6e5d751.tar.xz nixpkgs-910f233fb7120c51cb8cbbaed4fab4caa6e5d751.tar.zst nixpkgs-910f233fb7120c51cb8cbbaed4fab4caa6e5d751.zip | |
captive-browser: fix empty string in interface args
Fixes nmcli being passed an empty string before the interface name, which would stop captive-browser from starting up.
Diffstat (limited to 'nixos/modules/programs/captive-browser.nix')
| -rw-r--r-- | nixos/modules/programs/captive-browser.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index 1f223e2475c..3c52f32f473 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -84,18 +84,18 @@ in programs.captive-browser.dhcp-dns = let - iface = prefix: - optionalString cfg.bindInterface (concatStringsSep " " (map escapeShellArg [ prefix cfg.interface ])); + iface = prefixes: + optionalString cfg.bindInterface (escapeShellArgs (prefixes ++ [ cfg.interface ])); in mkOptionDefault ( if config.networking.networkmanager.enable then - "${pkgs.networkmanager}/bin/nmcli dev show ${iface ""} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS" + "${pkgs.networkmanager}/bin/nmcli dev show ${iface []} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS" else if config.networking.dhcpcd.enable then - "${pkgs.dhcpcd}/bin/dhcpcd ${iface "-U"} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers" + "${pkgs.dhcpcd}/bin/dhcpcd ${iface ["-U"]} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers" else if config.networking.useNetworkd then - "${cfg.package}/bin/systemd-networkd-dns ${iface ""}" + "${cfg.package}/bin/systemd-networkd-dns ${iface []}" else - "${config.security.wrapperDir}/udhcpc --quit --now -f ${iface "-i"} -O dns --script ${ + "${config.security.wrapperDir}/udhcpc --quit --now -f ${iface ["-i"]} -O dns --script ${ pkgs.writeShellScript "udhcp-script" '' if [ "$1" = bound ]; then echo "$dns" |