Author: eelco
Date: Tue Mar 20 21:43:13 2012
New Revision: 33308
URL: https://nixos.org/websvn/nix/?rev=33308&sc=1
Log:
* Remove an obsolete line.
Modified:
nixos/trunk/modules/system/boot/stage-2-init.sh
nixos/trunk/modules/system/boot/stage-2.nix
Modified: nixos/trunk/modules/system/boot/stage-2-init.sh
==============================================================================
--- nixos/trunk/modules/system/boot/stage-2-init.sh Tue Mar 20 21:38:38
2012 (r33307)
+++ nixos/trunk/modules/system/boot/stage-2-init.sh Tue Mar 20 21:43:13
2012 (r33308)
@@ -160,10 +160,6 @@
ln -sfn /var/run/booted-system /nix/var/nix/gcroots/booted-system
-# Ensure that the module tools can find the kernel modules.
-export MODULE_DIR=@kernel@/lib/modules/
-
-
# Run any user-specified commands.
@shell@ @postBootCommands@
Modified: nixos/trunk/modules/system/boot/stage-2.nix
==============================================================================
--- nixos/trunk/modules/system/boot/stage-2.nix Tue Mar 20 21:38:38 2012
(r33307)
+++ nixos/trunk/modules/system/boot/stage-2.nix Tue Mar 20 21:43:13 2012
(r33308)
@@ -51,7 +51,6 @@
src = ./stage-2-init.sh;
shellDebug = "${pkgs.bashInteractive}/bin/bash";
isExecutable = true;
- inherit kernel;
inherit (config.boot) devShmSize runSize;
ttyGid = config.ids.gids.tty;
upstart = config.system.build.upstart;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
