raboof/liminix
1
0
Fork 0
forked from dan/liminix
Code Pull Requests Activity

WiP

Browse Source
This commit is contained in:
Arnout Engelen 2024-12-20 23:24:29 +01:00
parent db3d96c459
commit 3d5ed21b0a
No known key found for this signature in database
GPG Key ID: 061107B0F74A6DAA
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/base.nix
View File

@ -113,7 +113,7 @@ in {
[ s6 s6-init-bin execline s6-linux-init s6-rc ]; [ s6 s6-init-bin execline s6-linux-init s6-rc ];
boot.commandLine = [ boot.commandLine = [
"panic=10 oops=panic init=/bin/init loglevel=8" "panic=10 oops=panic init=/init loglevel=8 debug"
"root=${config.hardware.rootDevice}" "root=${config.hardware.rootDevice}"
"rootfstype=${config.rootfsType}" "rootfstype=${config.rootfsType}"
"fw_devlink=off" "fw_devlink=off"

1
modules/outputs/tftpboot.nix
View File

@ -125,6 +125,7 @@ in {
fdtput -p dtb /reserved-memory/$node no-map 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} 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" fdtput -t s dtb /chosen ${config.boot.commandLineDtbNode} "$cmd"
dtbSize=$(binsize ./dtb ) dtbSize=$(binsize ./dtb )

8
modules/s6/default.nix
View File

@ -5,7 +5,8 @@ let
s6 s6
s6-init-bin s6-init-bin
s6-linux-init s6-linux-init
stdenvNoCC; stdenvNoCC
writeShellScript;
inherit (lib.lists) unique concatMap; inherit (lib.lists) unique concatMap;
inherit (lib) concatStrings; inherit (lib) concatStrings;
inherit (builtins) map; inherit (builtins) map;
@ -283,7 +284,10 @@ in {
}; };
}; };
bin = dir { bin = dir {
init = symlink "${s6-init-bin}/bin/init"; #myinit = symlink "${s6-init-bin}/bin/init";
init = symlink (writeShellScript "myinit.sh" ''
echo 'tralala'
'');
}; };
}; };
}; };