cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nixos/virtualization: Allow building EFI / A1 OCI images

Browse source 
A couple notes:
---------------

Adding invalid `console=` parameters is not an issue. Any invalid
console is unused. The kernel will use the "rightmost" (last) valid
`console=` parameter as the default output. Thus the SBBR-mandated AMA0
on A1, and ttyS0 on x86_64 as documented by Oracle.

`nvme_core.shutdown_timeout=10` was added as it was written this way in
the A1 images. Unclear whether `nvme.shutdown_timeout=10` is wrong. At
worst this is a no-op.
This commit is contained in:
Samuel Dionne-Riel 2021-05-28 22:02:14 -04:00 committed by Thiago Kenji Okada
parent d944fb4a19
commit 2eb41eb208
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
nixos/modules/virtualisation/oci-common.nix
View file

@ -1,16 +1,26 @@
{ lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; let
cfg = config.oci;
in
{ {
imports = [ ../profiles/qemu-guest.nix ]; imports = [ ../profiles/qemu-guest.nix ];
# Taken from /proc/cmdline of Ubuntu 20.04.2 LTS on OCI # Taken from /proc/cmdline of Ubuntu 20.04.2 LTS on OCI
boot.kernelParams = [ boot.kernelParams = [
"console=tty1"
"console=ttyS0"
"nvme.shutdown_timeout=10" "nvme.shutdown_timeout=10"
"nvme_core.shutdown_timeout=10"
"libiscsi.debug_libiscsi_eh=1" "libiscsi.debug_libiscsi_eh=1"
"crash_kexec_post_notifiers" "crash_kexec_post_notifiers"
# VNC console
"console=tty1"
# x86_64-linux
"console=ttyS0"
# aarch64-linux
"console=ttyAMA0,115200"
]; ];
boot.growPartition = true; boot.growPartition = true;
@ -21,15 +31,23 @@ with lib;
autoResize = true; autoResize = true;
}; };
fileSystems."/boot" = lib.mkIf cfg.efi {
device = "/dev/disk/by-label/ESP";
fsType = "vfat";
};
boot.loader.efi.canTouchEfiVariables = false;
boot.loader.grub = { boot.loader.grub = {
version = 2; version = 2;
device = "/dev/sda"; device = if cfg.efi then "nodev" else "/dev/sda";
splashImage = null; splashImage = null;
extraConfig = '' extraConfig = ''
serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1 serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
terminal_input --append serial terminal_input --append serial
terminal_output --append serial terminal_output --append serial
''; '';
efiInstallAsRemovable = cfg.efi;
efiSupport = cfg.efi;
}; };
# https://docs.oracle.com/en-us/iaas/Content/Compute/Tasks/configuringntpservice.htm#Configuring_the_Oracle_Cloud_Infrastructure_NTP_Service_for_an_Instance # https://docs.oracle.com/en-us/iaas/Content/Compute/Tasks/configuringntpservice.htm#Configuring_the_Oracle_Cloud_Infrastructure_NTP_Service_for_an_Instance