public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos-generate-config: fix #12595: broadcom quoting

Browse Source
This commit is contained in:
Vladimír Čunát 2016-01-25 07:55:42 +01:00
parent c473bea69a
commit 3e1599f57b
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@ -148,7 +148,7 @@ sub pciCheck {
$device eq "0x4331" || $device eq "0x43a0" || $device eq "0x43b1" $device eq "0x4331" || $device eq "0x43a0" || $device eq "0x43b1"
) ) ) )
{ {
push @modulePackages, "\${config.boot.kernelPackages.broadcom_sta}"; push @modulePackages, "config.boot.kernelPackages.broadcom_sta";
push @kernelModules, "wl"; push @kernelModules, "wl";
} }
@ -422,13 +422,20 @@ EOF
# Generate the hardware configuration file. # Generate the hardware configuration file.
sub toNixExpr { sub toNixStringList {
my $res = ""; my $res = "";
foreach my $s (@_) { foreach my $s (@_) {
$res .= " \"$s\""; $res .= " \"$s\"";
} }
return $res; return $res;
} }
sub toNixList {
my $res = "";
foreach my $s (@_) {
$res .= " $s";
}
return $res;
}
sub multiLineList { sub multiLineList {
my $indent = shift; my $indent = shift;
@ -444,9 +451,9 @@ sub multiLineList {
return $res; return $res;
} }
my $initrdAvailableKernelModules = toNixExpr(uniq @initrdAvailableKernelModules); my $initrdAvailableKernelModules = toNixStringList(uniq @initrdAvailableKernelModules);
my $kernelModules = toNixExpr(uniq @kernelModules); my $kernelModules = toNixStringList(uniq @kernelModules);
my $modulePackages = toNixExpr(uniq @modulePackages); my $modulePackages = toNixList(uniq @modulePackages);
my $fsAndSwap = ""; my $fsAndSwap = "";
if (!$noFilesystems) { if (!$noFilesystems) {