summary refs log tree commit diff
path: root/modules/installer/cd-dvd/iso-image.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-09-14 18:20:50 +0000
committerPeter Simons <simons@cryp.to>2011-09-14 18:20:50 +0000
commiteb6e1310b8774f3aed4c5675d09708f0df6199d3 (patch)
tree3297542b3cda78d38731abb65837f4553cd377a9 /modules/installer/cd-dvd/iso-image.nix
parentf5e8d35f8e76755febf97ca8f62b0700a8b6d20a (diff)
downloadnixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.gz
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.bz2
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.lz
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.xz
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.zst
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.zip
strip trailing whitespace; no functional change
svn path=/nixos/trunk/; revision=29285
Diffstat (limited to 'modules/installer/cd-dvd/iso-image.nix')
-rw-r--r--modules/installer/cd-dvd/iso-image.nix18
1 files changed, 9 insertions, 9 deletions
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index 6e1994cffc7..d565435ffd2 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -85,7 +85,7 @@ let
 
 
   # The configuration file for Grub.
-  grubCfg = 
+  grubCfg =
     ''
       set default=${builtins.toString config.boot.loader.grub.default}
       set timeout=${builtins.toString config.boot.loader.grub.timeout}
@@ -104,12 +104,12 @@ let
           set menu_color_normal=cyan/blue
           set menu_color_highlight=white/blue
         fi
-        
+
       fi
 
       ${config.boot.loader.grub.extraEntries}
     '';
-  
+
 in
 
 {
@@ -154,13 +154,13 @@ in
   # We need squashfs in the initrd to mount the compressed Nix store,
   # and aufs to make the root filesystem appear writable.
   boot.extraModulePackages =
-    optional 
-      (! ( config.boot.kernelPackages.kernel.features ? aufs || config.boot.kernelPackages.kernel.features ? aufs2_1 ) ) 
+    optional
+      (! ( config.boot.kernelPackages.kernel.features ? aufs || config.boot.kernelPackages.kernel.features ? aufs2_1 ) )
       config.boot.kernelPackages.aufs2
     ++ optional
       ( config.boot.kernelPackages.kernel.features ? aufs2_1 )
       config.boot.kernelPackages.aufs2_1;
-      
+
   boot.initrd.availableKernelModules = [ "aufs" "squashfs" "iso9660" ];
 
   boot.initrd.kernelModules = [ "loop" ];
@@ -184,7 +184,7 @@ in
   # Closures to be copied to the Nix store on the CD, namely the init
   # script and the top-level system configuration directory.
   isoImage.storeContents =
-    [ config.system.build.toplevel ] ++ 
+    [ config.system.build.toplevel ] ++
     optional config.isoImage.includeSystemBuildDependencies
       config.system.build.toplevel.drvPath;
 
@@ -237,13 +237,13 @@ in
         chainloader +1
       }
     '';
-    
+
   boot.loader.grub.timeout = 10;
 
   # Create the ISO image.
   system.build.isoImage = import ../../../lib/make-iso9660-image.nix {
     inherit (pkgs) stdenv perl cdrkit pathsFromGraph;
-    
+
     inherit (config.isoImage) isoName compressImage volumeID contents;
 
     bootable = true;