Author: viric
Date: Mon Mar 12 09:42:24 2012
New Revision: 33009
URL: https://nixos.org/websvn/nix/?rev=33009&sc=1
Log:
Properly filter a possible lack of "grub.device", in case of using only
"grub.devices".
Modified:
nixos/trunk/modules/system/activation/top-level.nix
Modified: nixos/trunk/modules/system/activation/top-level.nix
==============================================================================
--- nixos/trunk/modules/system/activation/top-level.nix Mon Mar 12 08:13:10
2012 (r33008)
+++ nixos/trunk/modules/system/activation/top-level.nix Mon Mar 12 09:42:24
2012 (r33009)
@@ -171,10 +171,12 @@
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;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
