From b2030266ac1cc4fe866889e6bd3f3f4547fd7851 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 21 Dec 2024 14:46:41 -0800 Subject: [PATCH] patch stand to support 3x longer config lines --- .../bsd/openbsd/pkgs/cmd-buff-size.patch | 17 +++++++++++++++++ .../bsd/openbsd/pkgs/stand/package.nix | 5 ++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/bsd/openbsd/pkgs/cmd-buff-size.patch diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/cmd-buff-size.patch b/pkgs/os-specific/bsd/openbsd/pkgs/cmd-buff-size.patch new file mode 100644 index 000000000000..f4f7dab95f70 --- /dev/null +++ b/pkgs/os-specific/bsd/openbsd/pkgs/cmd-buff-size.patch @@ -0,0 +1,17 @@ +OpenBSD's bootloader supports input configuration lines from both the console +and configuration files of only up to 133 characters. This is easy to break +with nix store paths. Triple it to 399. + +diff --git a/sys/stand/boot/cmd.h b/sys/stand/boot/cmd.h +index 5045f052b8b..9fc5ce9e50a 100644 +--- a/sys/stand/boot/cmd.h ++++ b/sys/stand/boot/cmd.h +@@ -27,7 +27,7 @@ + * + */ + +-#define CMD_BUFF_SIZE 133 ++#define CMD_BUFF_SIZE 399 + #define BOOTDEVLEN 1024 + + struct cmd_table { diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/stand/package.nix b/pkgs/os-specific/bsd/openbsd/pkgs/stand/package.nix index 0aa3e0efec65..981539be2d04 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/stand/package.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/stand/package.nix @@ -8,7 +8,10 @@ mkDerivation { path = "sys/arch/amd64/stand"; extraPaths = [ "sys" ]; - patches = [ ../sys/initpath.patch ]; + patches = [ + ../sys/initpath.patch + ./cmd-buff-size.patch + ]; # gcc compat postPatch = ''