From daa814980e37629298e85115cf8db64dba2a8472 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 Dec 2009 18:31:21 +0000
Subject: [PATCH] * At the end of stage 1, reset /proc/sys/kernel/modprobe to  
 /sbin/modprobe because the sactivation script in stage 2 expects it   to be
 so.

svn path=/nixos/trunk/; revision=18977
---
 modules/system/boot/stage-1-init.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 616f14156a4..db712f48ee1 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -291,6 +291,10 @@ if ! test -e $targetRoot/dev/console; then
 fi
 
 
+# Restore /proc/sys/kernel/modprobe to its original value.
+echo /sbin/modprobe > /proc/sys/kernel/modprobe
+
+
 # Start stage 2.  `run-init' deletes all files in the ramfs on the
 # current /.  Note that $stage2Init might be an absolute symlink, in
 # which case "-e" won't work because we're not in the chroot yet.