Author: viric
Date: Fri May 25 08:09:25 2012
New Revision: 34238
URL: https://nixos.org/websvn/nix/?rev=34238&sc=1
Log:
Fixing the evaluation of the system-tarball-pc.
It complained that grub device wasn't defined, and I guess it wanted some
fileSystems too. I copied those details from the sheevaplug expression, that I
made evaluate some minutes ago.
Modified:
nixos/trunk/modules/installer/cd-dvd/system-tarball-pc.nix
Modified: nixos/trunk/modules/installer/cd-dvd/system-tarball-pc.nix
==============================================================================
--- nixos/trunk/modules/installer/cd-dvd/system-tarball-pc.nix Fri May 25
07:52:12 2012 (r34237)
+++ nixos/trunk/modules/installer/cd-dvd/system-tarball-pc.nix Fri May 25
08:09:25 2012 (r34238)
@@ -1,5 +1,5 @@
# This module contains the basic configuration for building a NixOS
-# installation CD.
+# tarball, that can directly boot, maybe using PXE or unpacking on a fs.
{ config, pkgs, ... }:
@@ -164,10 +164,20 @@
# To be able to use the systemTarball to catch troubles.
boot.crashDump = {
enable = true;
- # Why not a recent kernel?
- kernelPackages = pkgs.linuxPackages_3_2;
+ kernelPackages = pkgs.linuxPackages_3_4;
};
+ # No grub for the tarball.
+ boot.loader.grub.enable = false;
+
+ /* fake entry, just to have a happy stage-1. Users
+ may boot without having stage-1 though */
+ fileSystems = [
+ { mountPoint = "/";
+ device = "/dev/something";
+ }
+ ];
+
nixpkgs.config = {
packageOverrides = p: rec {
linux_3_2 = p.linux_3_2.override {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
