From 4a8b316cf6f14b5e1f7e6bee04070b685c69881b Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 27 Aug 2006 22:31:35 +0000
Subject: [PATCH] * show installation instructions at install time * update
 manual to reflect new method better

svn path=/nixu/trunk/; revision=6285
---
 doc/howto | 14 +++++++-------
 login.sh  | 12 ++++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/doc/howto b/doc/howto
index cb5f572535f..58e3344d6ea 100644
--- a/doc/howto
+++ b/doc/howto
@@ -1,4 +1,4 @@
-NixOS installation HOWTO -- October 3, 2005
+NixOS installation HOWTO -- August 28, 2006
 
 This is small HOWTO of how to build and install the current version of
 NixOS.
@@ -39,16 +39,16 @@ the script:
 
 # sh fill-disk.sh
 
-The configuration data that grub writes to disk might not be correct. The
-grub configuration writes a file to disk which assumes /dev/hda1 is the root
-partition.
+The configuration data that grub writes to disk might not be correct (should
+be). When something goes wrong you probably won't have to reinstall. The
+manual for grub is quite helpful in these cases.
 
   Configuring
 
 To get NixOS in a working state, do the following:
 
-- load the networkdriver. This is machine dependent. On the labmachines this
-is the e1000 driver:
+- load the networkdriver. This is machine dependent. On the labmachines (Dell
+Optiplex GX-260) this is the e1000 driver:
 
 # modprobe e1000
 
@@ -93,7 +93,7 @@ NixOS machine (needed for mingetty). Alternatively, do:
 - relaunch init
 
 
-  Making hotplugging work
+  Making hotplugging work -- BROKEN RIGHT NOW
 
 Many devices (USB, Firewire) are controlled by so called "hot plugging". The
 kernel executes a program -- usually /sbin/hotplug, but this is configurable
diff --git a/login.sh b/login.sh
index c94a8e48d20..3a6b9983885 100644
--- a/login.sh
+++ b/login.sh
@@ -8,6 +8,18 @@ export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@util
 
 echo
 echo "=== Welcome to Nix! ==="
+echo "NixOS Installation instructions"
+echo ""
+echo "* edit the file called 'disklayout' (vi is provided) and provide"
+echo "  the following name=value pairs:"
+echo "  * INSTALLDEVICE (root device, for example /dev/hda1)"
+echo "  * SWAP (swap device, for example /dev/hda2)"
+echo "  * TARGETDRIVE (target drive to install grub, for example /dev/hda)"
+echo "* run: sh fill-disk.sh"
+echo ""
+echo ""
+echo ""
+echo ""
 
 export HOME=/
 cd $HOME