emily/nixos-images
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge #71

Browse source 
71: kexec fixes in google cloud r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
This commit is contained in:
bors[bot] 2023-02-22 15:21:23 +00:00 committed by GitHub
commit 18563a8ecb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nix/kexec-installer/module.nix
View file

@ -37,7 +37,7 @@ in {
key="$home/$file" key="$home/$file"
if [[ -e "$key" ]]; then if [[ -e "$key" ]]; then
# workaround for debian shenanigans # workaround for debian shenanigans
grep -o '\(ssh-[^ ]* .*\)' "$key" >> ssh/authorized_keys grep -o '\(ssh-[^ ]* .*\)' "$key" >> ssh/authorized_keys || true
fi fi
done done
done done
@ -98,10 +98,10 @@ in {
# IPMI SOL console redirection stuff # IPMI SOL console redirection stuff
boot.kernelParams = boot.kernelParams =
[ "console=ttyS0,115200" ] ++ [ "console=tty0" ] ++
(lib.optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) "console=ttyAMA0,115200") ++ (lib.optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) "console=ttyAMA0,115200") ++
(lib.optional (pkgs.stdenv.hostPlatform.isRiscV) "console=ttySIF0,115200") ++ (lib.optional (pkgs.stdenv.hostPlatform.isRiscV) "console=ttySIF0,115200") ++
[ "console=tty0" ]; [ "console=ttyS0,115200" ];
documentation.enable = false; documentation.enable = false;
# Not really needed. Saves a few bytes and the only service we are running is sshd, which we want to be reachable. # Not really needed. Saves a few bytes and the only service we are running is sshd, which we want to be reachable.