Author: shlevy
Date: Fri Mar 16 11:22:05 2012
New Revision: 33146
URL: https://nixos.org/websvn/nix/?rev=33146&sc=1
Log:
Restore old installation-cd-new-kernel.nix and create a new
installation-cd-efi.nix
Added:
nixos/trunk/modules/installer/cd-dvd/installation-cd-efi.nix
- copied unchanged from r33145,
nixos/trunk/modules/installer/cd-dvd/installation-cd-new-kernel.nix
Replaced:
nixos/trunk/modules/installer/cd-dvd/installation-cd-new-kernel.nix (props
changed)
- copied unchanged from r33139,
nixos/trunk/modules/installer/cd-dvd/installation-cd-new-kernel.nix
Copied: nixos/trunk/modules/installer/cd-dvd/installation-cd-efi.nix (from
r33145, nixos/trunk/modules/installer/cd-dvd/installation-cd-new-kernel.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixos/trunk/modules/installer/cd-dvd/installation-cd-efi.nix Fri Mar
16 11:22:05 2012 (r33146, copy of r33145,
nixos/trunk/modules/installer/cd-dvd/installation-cd-new-kernel.nix)
@@ -0,0 +1,22 @@
+{ config, pkgs, ... }:
+
+{
+ require = [ ./installation-cd-graphical.nix ];
+
+ boot.kernelPackages = pkgs.linuxPackages_3_3;
+ boot.vesa = false;
+
+ # What follows should probably move into base once the base kernel has the
+ # efi boot stub
+
+ # Get a console as soon as the initrd loads fbcon on EFI boot
+ boot.initrd.kernelModules = [ "fbcon" ];
+
+ # Enable reading EFI variables via sysfs
+ boot.kernelModules = [ "efivars" ];
+
+ # efi-related tools
+ environment.systemPackages = [ pkgs.efibootmgr ];
+
+ isoImage.makeEfiBootable = true;
+}
Copied: nixos/trunk/modules/installer/cd-dvd/installation-cd-new-kernel.nix
(from r33139,
nixos/trunk/modules/installer/cd-dvd/installation-cd-new-kernel.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixos/trunk/modules/installer/cd-dvd/installation-cd-new-kernel.nix Fri Mar
16 11:22:05 2012 (r33146, copy of r33139,
nixos/trunk/modules/installer/cd-dvd/installation-cd-new-kernel.nix)
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+ require = [ ./installation-cd-graphical.nix ];
+
+ boot.kernelPackages = pkgs.linuxPackages_3_2;
+ boot.vesa = false;
+}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
