nixos-rebuild: fix entering sudo password over SSH

NixOS · Dec 30, 2023 · 053906e · 053906e
1 parent d147d22
commit 053906e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
@@ -163,10 +163,14 @@ done
 
 sudoCommand=(sudo --preserve-env="$preservedSudoVars" --)
 
-if [[ -n "$SUDO_USER" || -n "$remoteSudoAlways" ]]; then
+if [[ -n "$SUDO_USER" ]]; then
     maybeSudo=("${sudoCommand[@]}")
 fi
 
+if [[ -n "$remoteSudoAlways" ]]; then
+    maybeSudo=(-t "${sudoComand[@]}")
+fi
+
 # log the given argument to stderr if verbose mode is on
 logVerbose() {
     if [ -n "$verboseScript" ]; then
@@ -200,7 +204,7 @@ targetHostCmd() {
 
 targetHostSudoCmd() {
     if [[ -n "$remoteSudo" ]]; then
-        maybeSudo=("${sudoCommand[@]}")
+        maybeSudo=(-t "${sudoCommand[@]}")
     fi
 
     targetHostCmd "$@"