Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c3a6c8de8888
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fca97dfebccd
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Aug 19, 2019

  1. stage-1 init: fix debug menu 

    * Read one char at a time, so user doesn't have to enter "i<ENTER>"
  contrary to the menu;
* Exec shell inside setsid.
    @abbradar
    abbradar committed Aug 19, 2019
    Copy the full SHA
    fca97df View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/system/boot/stage-1-init.sh
4 changes: 2 additions & 2 deletions nixos/modules/system/boot/stage-1-init.sh
View file
Original file line number Diff line number Diff line change
@@ -44,13 +44,13 @@ EOF
*) to ignore the error and continue
EOF

read reply
read -n 1 reply

if [ -n "$allowShell" -a "$reply" = f ]; then
exec setsid @shell@ -c "exec @shell@ < /dev/$console >/dev/$console 2>/dev/$console"
elif [ -n "$allowShell" -a "$reply" = i ]; then
echo "Starting interactive shell..."
setsid @shell@ -c "@shell@ < /dev/$console >/dev/$console 2>/dev/$console" || fail
setsid @shell@ -c "exec @shell@ < /dev/$console >/dev/$console 2>/dev/$console" || fail
elif [ "$reply" = r ]; then
echo "Rebooting..."
reboot -f