diff options
| author | Ankit Pandey <pandeyan@grinnell.edu> | 2021-08-01 13:40:06 -0500 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-08-22 17:44:31 +0000 |
| commit | 66e129b194aad65c5c5d677171f38ba926d14a26 (patch) | |
| tree | c4773d32811bc92fc4c23c4f0b993fd80994e467 | |
| parent | Merge #135245: linux_*_hardened: update (into release-21.05) (diff) | |
| download | nixpkgs-origin/backport-132347-to-release-21.05.tar.gz | |
captive-browser: fix empty string in interface argsorigin/backport-132347-to-release-21.05
Fixes nmcli being passed an empty string before the interface name,
which would stop captive-browser from starting up.
(cherry picked from commit 910f233fb7120c51cb8cbbaed4fab4caa6e5d751)
| -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 007b0369ec10..d7684d08c6c7 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -85,18 +85,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" |