From edb597ad6a8150f50e6436973d56a7315b5c49fd Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 27 Sep 2024 14:12:21 +0200
Subject: [PATCH] Enable stage 2 shell

---
 lagarto-ox.nix          | 3 ++-
 patches/stage-2-init.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lagarto-ox.nix b/lagarto-ox.nix
index c850fbd..e1df79c 100644
--- a/lagarto-ox.nix
+++ b/lagarto-ox.nix
@@ -498,6 +498,7 @@
       #    systemd.log_target=console
       # NixOS interesting options:
       #    debug1                   enable debug shell in stage 1
+      #    debug2                   enable debug shell in stage 2 (custom)
       #    boot.trace               enable set -x in stage 1
       #    boot.tracedebug          enable set -x in stage 2
       # Ftrace interesting options:
@@ -509,7 +510,7 @@
     in prev.runCommand "uboot.txt" {} ''
       cat > $out <<EOF
       xtrace=yes
-      bootargs=root=/dev/ram0 loglevel=7 rw earlycon=sbi console=hvc0 init=${init}
+      bootargs=root=/dev/ram0 loglevel=7 rw earlycon=sbi console=hvc0 debug2 init=${init}
       ramdisk_size=$(stat --format %s $(readlink -f ${initrd}))
       bootcmd=fdt print; booti \''${kernel_addr_r} \''${ramdisk_addr_r}:\''${ramdisk_size} \''${fdtcontroladdr}
       EOF
diff --git a/patches/stage-2-init.sh b/patches/stage-2-init.sh
index 78d416f..d22470b 100755
--- a/patches/stage-2-init.sh
+++ b/patches/stage-2-init.sh
@@ -18,7 +18,7 @@ if [ "${IN_NIXOS_SYSTEMD_STAGE1:-}" != true ]; then
                 set -x
                 ;;
             debug2)
-                bash -i
+                @shellDebug@ -i
                 ;;
         esac
     done