NixOS/mobile-nixos
1
1
Fork 0
mirror of https://github.com/NixOS/mobile-nixos.git synced 2024-12-15 02:43:24 +03:00
Code Issues Projects Releases Wiki Activity

system/depthcharge: Use boot.kernelParams

Browse Source 
(and fix device_info.arch)
This commit is contained in:
Samuel Dionne-Riel 2020-05-23 18:15:21 -04:00
parent 84906bb8e4
commit b928b20e2a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/system-types/depthcharge/default.nix
View File

@ -8,6 +8,8 @@ let
inherit device_config;
initrd = config.system.build.initrd;
system = config.system.build.rootfs;
cmdline = lib.concatStringsSep " " config.boot.kernelParams;
arch = lib.strings.removeSuffix "-linux" config.mobile.system.system;
};
in
{

6
modules/system-types/depthcharge/depthcharge-build.nix
View File

@ -5,6 +5,8 @@
, system
, imageBuilder
, lib
, cmdline
, arch
, dtc
, ubootTools
@ -31,7 +33,7 @@ let
LINUX_FS = "0FC63DAF-8483-4772-8E79-3D69D8477DE4";
};
inherit (device_info) arch kernel kernel_cmdline dtbs;
inherit (device_info) kernel dtbs;
device_info = device_config.info;
device_name = device_config.name;
@ -42,7 +44,7 @@ let
# Kernel command line for vbutil_kernel.
kpart_config = writeTextFile {
name = "kpart-config-${device_name}";
text = kernel_cmdline;
text = cmdline;
};
# Name used for some image file output.