1
1
mirror of https://github.com/NixOS/mobile-nixos.git synced 2025-01-04 16:41:02 +03:00

qemu-x86_64: refactors splash into a variable...

To allow playing around.
This commit is contained in:
Samuel Dionne-Riel 2018-06-18 21:53:34 -04:00
parent 334185ea21
commit 809c3f37a6

View File

@ -2,6 +2,7 @@
with import ../../modules/initrd-order.nix; with import ../../modules/initrd-order.nix;
let let
splash = false;
kernel = pkgs.linuxPackages_4_16.kernel; kernel = pkgs.linuxPackages_4_16.kernel;
device_info = (lib.importJSON ../postmarketOS-devices.json).qemu-amd64; device_info = (lib.importJSON ../postmarketOS-devices.json).qemu-amd64;
@ -25,7 +26,11 @@ in
mobile.device.info = device_info // { mobile.device.info = device_info // {
# TODO : make kernel part of options. # TODO : make kernel part of options.
inherit kernel; inherit kernel;
kernel_cmdline = device_info.kernel_cmdline + " vga=${MODE.vga}"; kernel_cmdline = device_info.kernel_cmdline
+ " vga=${MODE.vga}"
# TODO : make cmdline configurable outside device.info (device.info would be used for device-specifics only)
+ lib.optionalString splash " quiet vt.global_cursor_default=0"
;
}; };
mobile.hardware = { mobile.hardware = {
soc = "generic-x86_64"; soc = "generic-x86_64";
@ -36,9 +41,8 @@ in
}; };
mobile.system.type = "kernel-initrd"; mobile.system.type = "kernel-initrd";
mobile.boot.stage-1 = { mobile.boot.stage-1 = {
# Comment the next two if you want to play around with splash. redirect-log.targets = lib.mkIf (splash != true) [ "/dev/tty0" ];
redirect-log.targets = [ "/dev/tty0" "/dev/kmsg" ]; splash.enable = splash;
splash.enable = false;
init = (lib.mkOrder BEFORE_READY_INIT '' init = (lib.mkOrder BEFORE_READY_INIT ''
echo "cmdline:" echo "cmdline:"
cat /proc/cmdline cat /proc/cmdline