From 22fc2bdb243de1ead277d2c2d66ad53e12e4a72d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 25 May 2012 08:09:25 +0000 Subject: [PATCH] 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. svn path=/nixos/trunk/; revision=34238 --- modules/installer/cd-dvd/system-tarball-pc.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix index c1a738568877..035b6dd6c0ad 100644 --- a/modules/installer/cd-dvd/system-tarball-pc.nix +++ b/modules/installer/cd-dvd/system-tarball-pc.nix @@ -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 @@ in # 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 {