summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/generate-config.pl
diff options
context:
space:
mode:
authorEric Culp <eculperic@gmail.com>2019-08-11 14:01:51 -0700
committerEric Culp <eculperic@gmail.com>2019-08-12 12:10:43 -0700
commit92cc949f9f9193ff49b4d5dcbd80eee39b6cd42d (patch)
treed6acbd262ad7e1f50e6205f028126002aeee2400 /pkgs/os-specific/linux/kernel/generate-config.pl
parentd98a165de78027202b8b12521bae472a6a47741d (diff)
downloadnixpkgs-92cc949f9f9193ff49b4d5dcbd80eee39b6cd42d.tar
nixpkgs-92cc949f9f9193ff49b4d5dcbd80eee39b6cd42d.tar.gz
nixpkgs-92cc949f9f9193ff49b4d5dcbd80eee39b6cd42d.tar.bz2
nixpkgs-92cc949f9f9193ff49b4d5dcbd80eee39b6cd42d.tar.lz
nixpkgs-92cc949f9f9193ff49b4d5dcbd80eee39b6cd42d.tar.xz
nixpkgs-92cc949f9f9193ff49b4d5dcbd80eee39b6cd42d.tar.zst
nixpkgs-92cc949f9f9193ff49b4d5dcbd80eee39b6cd42d.zip
kernel generate-config.pl: Allow whitespace in values
In particular, this allows setting CONFIG_CMDLINE to a value with
multiple space-seperated parameters. Other variables also take free-form
strings and might similarly benefit.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generate-config.pl')
-rw-r--r--pkgs/os-specific/linux/kernel/generate-config.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl
index f886fcfdc35..26fc07202bb 100644
--- a/pkgs/os-specific/linux/kernel/generate-config.pl
+++ b/pkgs/os-specific/linux/kernel/generate-config.pl
@@ -28,7 +28,7 @@ open ANSWERS, "<$ENV{KERNEL_CONFIG}" or die "Could not open answer file";
 while (<ANSWERS>) {
     chomp;
     s/#.*//;
-    if (/^\s*([A-Za-z0-9_]+)(\?)?\s+(\S+)\s*$/) {
+    if (/^\s*([A-Za-z0-9_]+)(\?)?\s+(.*\S)\s*$/) {
         $answers{$1} = $3;
         $requiredAnswers{$1} = !(defined $2);
     } elsif (!/^\s*$/) {