talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

nixos-rebuild: restore local sudo functionality

Browse Source 
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
  '';
}
```
This commit is contained in:
zimbatm 2025-06-14 08:57:13 +02:00
parent d022a1e7bc
commit 7d8a9fa0e1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View File

@ -33,6 +33,7 @@ imageVariant=
buildHost= buildHost=
targetHost= targetHost=
remoteSudo= remoteSudo=
localSudo=
noSSHTTY= noSSHTTY=
verboseScript= verboseScript=
noFlake= noFlake=
@ -173,6 +174,9 @@ while [ "$#" -gt 0 ]; do
--use-remote-sudo) --use-remote-sudo)
remoteSudo=1 remoteSudo=1
;; ;;
--use-local-sudo)
localSudo=1
;;
--no-ssh-tty) --no-ssh-tty)
noSSHTTY=1 noSSHTTY=1
;; ;;
@ -256,7 +260,7 @@ targetHostSudoCmd() {
t="-t" t="-t"
fi fi
if [ -n "$remoteSudo" ]; then if [[ -n "$remoteSudo" || -n "$localSudo" ]]; then
useSudo=1 SSHOPTS="$SSHOPTS $t" targetHostCmd "$@" useSudo=1 SSHOPTS="$SSHOPTS $t" targetHostCmd "$@"
else else
# While a tty might not be necessary, we apply it to be consistent with # While a tty might not be necessary, we apply it to be consistent with