pyrox.dev / nixpkgs
lol
fork atom

nixos-rebuild: restore local sudo functionality

This functionality used to exist and was then removed in #331741. The
issue was that $SUDO_USER is already used by `sudo` as an environment
variable.

This change makes it possible to checkout a flake repository, as a user,
enter the devshell, and with the additions below and apply changes with
`nixos-rebuild switch`.

```nix
{ pkgs }:
let
nixos-rebuild = pkgs.writeShellApplication {
name = "nixos-rebuild";
runtimeInputs = [ pkgs.nixos-rebuild ];
text = ''
set -euo pipefail
exec nixos-rebuild --flake "$PRJ_ROOT" --use-local-sudo "$@"
'';
};
in
pkgs.mkShellNoCC {
packages = [
nixos-rebuild
];

shellHook = ''
export PRJ_ROOT=$PWD
'';
}
```

zimbatm 7d8a9fa0 d022a1e7

options
unified split
Changed files
+5 -1
pkgs
os-specific
linux
nixos-rebuild
nixos-rebuild.sh
+5 -1
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh 
···

       
33

       
33

       
 

       
buildHost=


     

       
34

       
34

       
 

       
targetHost=


     

       
35

       
35

       
 

       
remoteSudo=


     

       

       
36

       
+

       
localSudo=


     

       
36

       
37

       
 

       
noSSHTTY=


     

       
37

       
38

       
 

       
verboseScript=


     

       
38

       
39

       
 

       
noFlake=


     
···

       
173

       
174

       
 

       
      --use-remote-sudo)


     

       
174

       
175

       
 

       
        remoteSudo=1


     

       
175

       
176

       
 

       
        ;;


     

       

       
177

       
+

       
      --use-local-sudo)


     

       

       
178

       
+

       
        localSudo=1


     

       

       
179

       
+

       
        ;;


     

       
176

       
180

       
 

       
      --no-ssh-tty)


     

       
177

       
181

       
 

       
        noSSHTTY=1


     

       
178

       
182

       
 

       
        ;;


     
···

       
256

       
260

       
 

       
        t="-t"


     

       
257

       
261

       
 

       
    fi


     

       
258

       
262

       
 

       



     

       
259

       

       
-

       
    if [ -n "$remoteSudo" ]; then


     

       

       
263

       
+

       
    if [[ -n "$remoteSudo" || -n "$localSudo" ]]; then


     

       
260

       
264

       
 

       
        useSudo=1 SSHOPTS="$SSHOPTS $t" targetHostCmd "$@"


     

       
261

       
265

       
 

       
    else


     

       
262

       
266

       
 

       
        # While a tty might not be necessary, we apply it to be consistent with