nix-community/raspberry-pi-nix
1
0
Fork 0
mirror of https://github.com/nix-community/raspberry-pi-nix.git synced 2025-11-09 20:16:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

shuffle kernel params

Browse source
This commit is contained in:
Travis Staton 2024-11-03 20:20:01 -05:00
parent ee53143215
commit f872d7748f
No known key found for this signature in database
GPG key ID: E883E53CDAC16260
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpi/default.nix
View file

@ -315,14 +315,8 @@ in
kernelParams = kernelParams =
if cfg.uboot.enable then [ ] if cfg.uboot.enable then [ ]
else [ else [
# This is ugly and fragile, but the sdImage image has an msdos "console=tty1"
# table, so the partition table id is a 1-indexed hex "console=serial0,115200n8"
# number. So, we drop the hex prefix and stick on a "02" to
# refer to the root partition.
# "root=PARTUUID=${lib.strings.removePrefix "0x" config.sdImage.firmwarePartitionID}-02"
# "rootfstype=ext4"
"fsck.repair=yes"
"rootwait"
"init=/sbin/init" "init=/sbin/init"
]; ];
initrd = { initrd = {

11
sd-image/default.nix
View file

@ -9,7 +9,16 @@
boot.consoleLogLevel = lib.mkDefault 7; boot.consoleLogLevel = lib.mkDefault 7;
# https://github.com/raspberrypi/firmware/issues/1539#issuecomment-784498108 # https://github.com/raspberrypi/firmware/issues/1539#issuecomment-784498108
boot.kernelParams = [ "console=serial0,115200n8" "console=tty1" ]; boot.kernelParams = [
# This is ugly and fragile, but the sdImage image has an msdos
# table, so the partition table id is a 1-indexed hex
# number. So, we drop the hex prefix and stick on a "02" to
# refer to the root partition.
"root=PARTUUID=${lib.strings.removePrefix "0x" config.sdImage.firmwarePartitionID}-02"
"rootfstype=ext4"
"fsck.repair=yes"
"rootwait"
];
sdImage = sdImage =
let let