From ee163c2c8012cdc5cdd8efce06a380e38e3018d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@vicerveza.homeunix.net> Date: Sun, 11 Mar 2012 22:43:37 +0000 Subject: [PATCH] Making the stage2 interpreter bash non-interactive, while keeping the interactive shell with bash interactive. Suggested by Eelco. svn path=/nixos/trunk/; revision=33005 --- modules/system/boot/stage-2-init.sh | 2 +- modules/system/boot/stage-2.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh index fdc8a0161ea..5bee0380003 100644 --- a/modules/system/boot/stage-2-init.sh +++ b/modules/system/boot/stage-2-init.sh @@ -182,7 +182,7 @@ if [ -n "$debug2" ]; then done echo "Debug shell called from @out@" - setsid @shell@ < /dev/$console >/dev/$console 2>/dev/$console + setsid @shellDebug@ < /dev/$console >/dev/$console 2>/dev/$console fi diff --git a/modules/system/boot/stage-2.nix b/modules/system/boot/stage-2.nix index db867ab8a28..35b1aead1b0 100644 --- a/modules/system/boot/stage-2.nix +++ b/modules/system/boot/stage-2.nix @@ -49,7 +49,7 @@ let bootStage2 = pkgs.substituteAll { src = ./stage-2-init.sh; - shell = "${pkgs.bashInteractive}/bin/bash"; + shellDebug = "${pkgs.bashInteractive}/bin/bash"; isExecutable = true; inherit kernel; inherit (config.boot) devShmSize runSize;