nixos-generate-config: fix #12595: broadcom quoting
This commit is contained in:
parent
c473bea69a
commit
3e1599f57b
|
@ -148,7 +148,7 @@ sub pciCheck {
|
|||
$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";
|
||||
}
|
||||
|
||||
|
@ -422,13 +422,20 @@ EOF
|
|||
|
||||
# Generate the hardware configuration file.
|
||||
|
||||
sub toNixExpr {
|
||||
sub toNixStringList {
|
||||
my $res = "";
|
||||
foreach my $s (@_) {
|
||||
$res .= " \"$s\"";
|
||||
}
|
||||
return $res;
|
||||
}
|
||||
sub toNixList {
|
||||
my $res = "";
|
||||
foreach my $s (@_) {
|
||||
$res .= " $s";
|
||||
}
|
||||
return $res;
|
||||
}
|
||||
|
||||
sub multiLineList {
|
||||
my $indent = shift;
|
||||
|
@ -444,9 +451,9 @@ sub multiLineList {
|
|||
return $res;
|
||||
}
|
||||
|
||||
my $initrdAvailableKernelModules = toNixExpr(uniq @initrdAvailableKernelModules);
|
||||
my $kernelModules = toNixExpr(uniq @kernelModules);
|
||||
my $modulePackages = toNixExpr(uniq @modulePackages);
|
||||
my $initrdAvailableKernelModules = toNixStringList(uniq @initrdAvailableKernelModules);
|
||||
my $kernelModules = toNixStringList(uniq @kernelModules);
|
||||
my $modulePackages = toNixList(uniq @modulePackages);
|
||||
|
||||
my $fsAndSwap = "";
|
||||
if (!$noFilesystems) {
|
||||
|
|
Loading…
Reference in a new issue