From 9cbf8a84fb42b1fa0b6fbf2b94db740e9c6a34e4 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat, 7 Jan 2006 14:36:13 +0000
Subject: [PATCH] enable swap during install

svn path=/nixu/trunk/; revision=4503
---
 fill-disk.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/fill-disk.sh b/fill-disk.sh
index d36f4bc044b..b8acc73ad19 100755
--- a/fill-disk.sh
+++ b/fill-disk.sh
@@ -1,6 +1,6 @@
 #! @bash@/bin/sh -e
 
-export PATH=/bin:/sbin:@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@utilLinux@/bin:@utilLinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@eject@/bin:@kudzu@/sbin
+export PATH=/bin:/sbin:@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@utilLinux@/bin:@utilLinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@eject@/bin:@kudzu@/sbin:@xawtv@/bin
 
 ##
 ## In the beginning we want to have a minimalistic environment, built with
@@ -8,6 +8,7 @@ export PATH=/bin:/sbin:@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils
 ##
 
 kernel=@kernel@
+xawtv=@xawtv@
 
 storePaths=/mystorepaths
 
@@ -92,11 +93,17 @@ echo starting emergency shell on tty2
 
 exec ./ramdisk-login.sh /dev/tty2 &
 
+echo formatting target device
+
 targetdrive=/dev/hda
 device=${targetdrive}1
 mkfs.ext2 ${device}
-mkswap ${targetdrive}2
+swapdevice=${targetdrive}2
+mkswap $swapdevice
 
+echo enabling swap
+
+swapon $swapdevice
 
 #if ! test -n "$1"
 #then
@@ -297,8 +304,8 @@ echo "id:2:initdefault:" >> $root/etc/inittab
 echo "si::bootwait:$bootPath/bin/boot.sh" >> $root/etc/inittab
 echo "ht:06:wait:$bootPath/bin/halt.sh" >> $root/etc/inittab
 echo "1:2345:respawn:$bootPath/bin/login.sh /dev/tty1" >> $root/etc/inittab
-echo "2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
-echo "3:2345:respawn:$mingetty/sbin/mingetty tty3" >> $root/etc/inittab
+echo "#2:2345:respawn:$mingetty/sbin/mingetty tty2" >> $root/etc/inittab
+echo "#3:2345:respawn:$mingetty/sbin/mingetty tty3" >> $root/etc/inittab
 #echo "2:2345:respawn:$bootPath/bin/login.sh /dev/ttys/1" >> $root/etc/inittab
 
 echo setting up networking information...
@@ -326,6 +333,7 @@ echo default profile for root
 echo "source @nix@/etc/profile.d/nix.sh" > $root/root/.profile
 
 touch_file /etc/login.defs
+touch_file /etc/services
 
 ###
 ### Do kernel stuff here.