diff --git a/modules/outputs/tftpboot.nix b/modules/outputs/tftpboot.nix index ac925f9f..bd63a442 100644 --- a/modules/outputs/tftpboot.nix +++ b/modules/outputs/tftpboot.nix @@ -70,7 +70,6 @@ in { zimage = "bootz"; }; in choices.${cfg.kernelFormat}; - cmdline = concatStringsSep " " config.boot.commandLine; objcopy = "${pkgs.stdenv.cc.bintools.targetPrefix}objcopy"; stripAndZip = '' cp vmlinux vmlinux.elf; chmod +w vmlinux.elf diff --git a/modules/s6/default.nix b/modules/s6/default.nix index a530e166..53d79680 100644 --- a/modules/s6/default.nix +++ b/modules/s6/default.nix @@ -5,8 +5,7 @@ let s6 s6-init-bin s6-linux-init - stdenvNoCC - writeShellScript; + stdenvNoCC; inherit (lib.lists) unique concatMap; inherit (lib) concatStrings; inherit (builtins) map; @@ -293,9 +292,6 @@ in { }; bin = dir { init = symlink "${s6-init-bin}/bin/init"; - #init = symlink (writeShellScript "myinit.sh" '' - # echo 'tralala' - #''); }; }; }; diff --git a/pkgs/kernel/kernel_fdt.its b/pkgs/kernel/kernel_fdt.its index 6127d80e..c9907cf0 100644 --- a/pkgs/kernel/kernel_fdt.its +++ b/pkgs/kernel/kernel_fdt.its @@ -40,8 +40,8 @@ }; configurations { - default = "config-1"; - config-1 { + default = "conf-1"; + conf-1 { description = "Boot Linux kernel with FDT blob"; kernel = "kernel"; fdt = "fdt-1";