diff options
author | Florian Klink <flokli@flokli.de> | 2023-08-30 13:27:35 +0300 |
---|---|---|
committer | Florian Klink <flokli@flokli.de> | 2023-09-12 16:55:15 +0200 |
commit | 0bfc763df22be1085ab2c5d953436e9c1b1da965 (patch) | |
tree | 814ba8ef7bcc6fe4871fa8233dce7b222b377547 /nixos/modules/services | |
parent | 5626174a094cf3cea94ad41062c21c9806c6cef8 (diff) | |
download | nixlib-0bfc763df22be1085ab2c5d953436e9c1b1da965.tar nixlib-0bfc763df22be1085ab2c5d953436e9c1b1da965.tar.gz nixlib-0bfc763df22be1085ab2c5d953436e9c1b1da965.tar.bz2 nixlib-0bfc763df22be1085ab2c5d953436e9c1b1da965.tar.lz nixlib-0bfc763df22be1085ab2c5d953436e9c1b1da965.tar.xz nixlib-0bfc763df22be1085ab2c5d953436e9c1b1da965.tar.zst nixlib-0bfc763df22be1085ab2c5d953436e9c1b1da965.zip |
nixos/modemmanager: enableFccUnlock -> enableBundledFccUnlockScripts
PR #155414 introduced an option to support enabling the FCC unlock scripts that ModemManager provides, but since 1.18.4 doesn't execute anymore. However, this option is specifically only about the unlock scripts provided with ModemManager so far. Rename the option to make this more obvious.
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index ed0ca1abe39b..f41a0b015348 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -370,11 +370,12 @@ in ''; }; - enableFccUnlock = mkOption { + enableBundledFccUnlockScripts = mkOption { type = types.bool; default = false; description = lib.mdDoc '' - Enable FCC unlock procedures. Since release 1.18.4, the ModemManager daemon no longer + Enable FCC unlock procedures shipped with ModemManager. + Since release 1.18.4, the ModemManager daemon no longer automatically performs the FCC unlock procedure by default. See [the docs](https://modemmanager.org/docs/modemmanager/fcc-unlock/) for more details. @@ -388,6 +389,7 @@ in [ "networking" "networkmanager" "packages" ] [ "networking" "networkmanager" "plugins" ]) (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ]) + (mkRenamedOptionModule [ "networking" "networkmanager" "enableFccUnlock" ] [ "networking" "networkmanager" "enableBundledFccUnlockScripts" ]) (mkRemovedOptionModule [ "networking" "networkmanager" "dynamicHosts" ] '' This option was removed because allowing (multiple) regular users to override host entries affecting the whole system opens up a huge attack @@ -423,7 +425,7 @@ in source = "${pkg}/lib/NetworkManager/${pkg.networkManagerPlugin}"; }) cfg.plugins) - // optionalAttrs cfg.enableFccUnlock + // optionalAttrs cfg.enableBundledFccUnlockScripts { "ModemManager/fcc-unlock.d".source = "${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/*"; |