lol

Merge pull request #144429 from anund/nixos-rebuild-fix-install-bootloader

nixos-rebuild: fix --install-bootloader

authored by

Artturi and committed by
GitHub
add0eb81 7143a8d4

+6 -4
+6 -4
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
··· 29 29 profile=/nix/var/nix/profiles/system 30 30 buildHost=localhost 31 31 targetHost= 32 - maybeSudo=() 32 + remoteSudo= 33 + # comma separated list of vars to preserve when using sudo 34 + preservedSudoVars=NIXOS_INSTALL_BOOTLOADER 33 35 34 36 while [ "$#" -gt 0 ]; do 35 37 i="$1"; shift 1 ··· 100 102 shift 1 101 103 ;; 102 104 --use-remote-sudo) 103 - maybeSudo=(sudo --) 105 + remoteSudo=1 104 106 ;; 105 107 --flake) 106 108 flake="$1" ··· 126 128 esac 127 129 done 128 130 129 - if [ -n "$SUDO_USER" ]; then 130 - maybeSudo=(sudo --) 131 + if [[ -n "$SUDO_USER" || -n $remoteSudo ]]; then 132 + maybeSudo=(sudo --preserve-env="$preservedSudoVars" --) 131 133 fi 132 134 133 135 if [ -z "$buildHost" -a -n "$targetHost" ]; then