* Use SCSI instead of IDE, much faster.

svn path=/nixpkgs/trunk/; revision=11165
This commit is contained in:
Eelco Dolstra 2008-03-17 16:12:19 +00:00
parent 2a20ef9694
commit 0301a74bf0

View File

@ -5,8 +5,7 @@ rec {
modulesClosure = makeModulesClosure { modulesClosure = makeModulesClosure {
inherit kernel; inherit kernel;
#rootModules = ["cifs" "ne2k_pci" "nls_utf8" "ata_piix" "sd_mod"]; rootModules = ["cifs" "ne2k_pci" "nls_utf8" "ata_piix" "sd_mod"];
rootModules = ["cifs" "ne2k_pci" "nls_utf8" "ide_disk" "ide_generic"];
}; };
@ -84,7 +83,7 @@ rec {
if test -z "$mountDisk"; then if test -z "$mountDisk"; then
mount -t tmpfs none /fs mount -t tmpfs none /fs
else else
mount -t ext2 /dev/hda /fs mount -t ext2 /dev/sda /fs
fi fi
mkdir -p /fs/hostfs mkdir -p /fs/hostfs
@ -230,8 +229,8 @@ rec {
buildCommand = '' buildCommand = ''
mkdir /mnt mkdir /mnt
${e2fsprogs}/sbin/mke2fs -F /dev/hda ${e2fsprogs}/sbin/mke2fs -F /dev/sda
${klibcShrunk}/bin/mount -t ext2 /dev/hda /mnt ${klibcShrunk}/bin/mount -t ext2 /dev/sda /mnt
mkdir /mnt/proc /mnt/dev /mnt/sys mkdir /mnt/proc /mnt/dev /mnt/sys
@ -262,7 +261,7 @@ rec {
test2 = fillDiskWithRPMs { test2 = fillDiskWithRPMs {
size = 1024; size = 1024;
name = "test"; name = "testY";
fullName = "Test Image"; fullName = "Test Image";
rpms = import ./rpm/fedora-3-packages.nix {inherit fetchurl;}; rpms = import ./rpm/fedora-3-packages.nix {inherit fetchurl;};
}; };
@ -337,8 +336,8 @@ rec {
buildCommand = '' buildCommand = ''
mkdir /mnt mkdir /mnt
${e2fsprogs}/sbin/mke2fs -F /dev/hda ${e2fsprogs}/sbin/mke2fs -F /dev/sda
${klibcShrunk}/bin/mount -t ext2 /dev/hda /mnt ${klibcShrunk}/bin/mount -t ext2 /dev/sda /mnt
if test -e /mnt/.debug; then if test -e /mnt/.debug; then
exec ${bash}/bin/sh exec ${bash}/bin/sh