From 99d3e0c1680c0e652e6da1e50de465c176fd6d92 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 14 Jan 2024 00:48:53 +0100
Subject: [PATCH] Revert "nixos-rebuild: fix entering sudo password over SSH"

This reverts commit 09fd207cb8a6a1e654cdc9dc49610ebd456fe05d.

It caused a regression when using `--build-host` and flakes.
See https://github.com/NixOS/nixpkgs/pull/277642#issuecomment-1890783714
---
 pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
index 4439487a9301..ba8c8fc537a3 100755
--- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
@@ -436,7 +436,7 @@ if [ "$action" = edit ]; then
     exit 1
 fi
 
-SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60 -t"
+SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60"
 
 # First build Nix, since NixOS may require a newer version than the
 # current one.