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

Properly filter a possible lack of "grub.device", in case of using only "grub.devices".

Browse Source 
svn path=/nixos/trunk/; revision=33009
This commit is contained in:
Lluís Batlle i Rossell 2012-03-12 09:42:24 +00:00
parent 3c0fdaf877
commit 9e980235bd
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/system/activation/top-level.nix
View File

@ -171,10 +171,12 @@ let
if config.boot.loader.grub.enable
then (builtins.parseDrvName config.system.build.grub.name).version
else "";
grubDevices = let
grubDevices = with pkgs.lib; let
wrapQuotes = s: "\"" + s + "\"";
in map wrapQuotes ([ config.boot.loader.grub.device ] ++
config.boot.loader.grub.devices);
allDevices = [ config.boot.loader.grub.device ] ++
config.boot.loader.grub.devices;
definedDevices = filter (s: s != "") allDevices;
in map wrapQuotes definedDevices;
configurationName = config.boot.loader.grub.configurationName;
};