diff --git a/modules/base.nix b/modules/base.nix index 12842711..7bc9a2be 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -113,7 +113,7 @@ in { [ s6 s6-init-bin execline s6-linux-init s6-rc ]; boot.commandLine = [ - "panic=10 oops=panic init=/bin/init loglevel=8" + "panic=10 oops=panic init=/init loglevel=8 debug" "root=${config.hardware.rootDevice}" "rootfstype=${config.rootfsType}" "fw_devlink=off" diff --git a/modules/outputs/tftpboot.nix b/modules/outputs/tftpboot.nix index 38730ee3..26b1019f 100644 --- a/modules/outputs/tftpboot.nix +++ b/modules/outputs/tftpboot.nix @@ -125,6 +125,7 @@ in { fdtput -p dtb /reserved-memory/$node no-map cmd="liminix ${cmdline} mtdparts=phram0:''${rootfsSize}(rootfs) phram.phram=phram0,''${rootfsStart},''${rootfsSize},${toString config.hardware.flash.eraseBlockSize} root=/dev/fit0"; + #cmd="liminix ${cmdline}" fdtput -t s dtb /chosen ${config.boot.commandLineDtbNode} "$cmd" dtbSize=$(binsize ./dtb ) diff --git a/modules/s6/default.nix b/modules/s6/default.nix index 08d71524..ac1bb65d 100644 --- a/modules/s6/default.nix +++ b/modules/s6/default.nix @@ -5,7 +5,8 @@ let s6 s6-init-bin s6-linux-init - stdenvNoCC; + stdenvNoCC + writeShellScript; inherit (lib.lists) unique concatMap; inherit (lib) concatStrings; inherit (builtins) map; @@ -283,7 +284,10 @@ in { }; }; bin = dir { - init = symlink "${s6-init-bin}/bin/init"; + #myinit = symlink "${s6-init-bin}/bin/init"; + init = symlink (writeShellScript "myinit.sh" '' + echo 'tralala' + ''); }; }; };