diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-03-17 16:12:19 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-03-17 16:12:19 +0000 |
| commit | 0301a74bf0c8d46151ba3c6c440ee54205ed5079 (patch) | |
| tree | 0a39ae5cde58b84656a924c45a027cedfe94a690 /pkgs | |
| parent | 2a20ef9694220ad11b696ae99ba4104064015bb6 (diff) | |
| download | nixlib-0301a74bf0c8d46151ba3c6c440ee54205ed5079.tar nixlib-0301a74bf0c8d46151ba3c6c440ee54205ed5079.tar.gz nixlib-0301a74bf0c8d46151ba3c6c440ee54205ed5079.tar.bz2 nixlib-0301a74bf0c8d46151ba3c6c440ee54205ed5079.tar.lz nixlib-0301a74bf0c8d46151ba3c6c440ee54205ed5079.tar.xz nixlib-0301a74bf0c8d46151ba3c6c440ee54205ed5079.tar.zst nixlib-0301a74bf0c8d46151ba3c6c440ee54205ed5079.zip | |
* Use SCSI instead of IDE, much faster.
svn path=/nixpkgs/trunk/; revision=11165
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/vm/vm.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/build-support/vm/vm.nix b/pkgs/build-support/vm/vm.nix index 24cfbbe4d0f0..cc53b0c84179 100644 --- a/pkgs/build-support/vm/vm.nix +++ b/pkgs/build-support/vm/vm.nix @@ -5,8 +5,7 @@ rec { modulesClosure = makeModulesClosure { inherit kernel; - #rootModules = ["cifs" "ne2k_pci" "nls_utf8" "ata_piix" "sd_mod"]; - rootModules = ["cifs" "ne2k_pci" "nls_utf8" "ide_disk" "ide_generic"]; + rootModules = ["cifs" "ne2k_pci" "nls_utf8" "ata_piix" "sd_mod"]; }; @@ -84,7 +83,7 @@ rec { if test -z "$mountDisk"; then mount -t tmpfs none /fs else - mount -t ext2 /dev/hda /fs + mount -t ext2 /dev/sda /fs fi mkdir -p /fs/hostfs @@ -230,8 +229,8 @@ rec { buildCommand = '' mkdir /mnt - ${e2fsprogs}/sbin/mke2fs -F /dev/hda - ${klibcShrunk}/bin/mount -t ext2 /dev/hda /mnt + ${e2fsprogs}/sbin/mke2fs -F /dev/sda + ${klibcShrunk}/bin/mount -t ext2 /dev/sda /mnt mkdir /mnt/proc /mnt/dev /mnt/sys @@ -262,7 +261,7 @@ rec { test2 = fillDiskWithRPMs { size = 1024; - name = "test"; + name = "testY"; fullName = "Test Image"; rpms = import ./rpm/fedora-3-packages.nix {inherit fetchurl;}; }; @@ -337,8 +336,8 @@ rec { buildCommand = '' mkdir /mnt - ${e2fsprogs}/sbin/mke2fs -F /dev/hda - ${klibcShrunk}/bin/mount -t ext2 /dev/hda /mnt + ${e2fsprogs}/sbin/mke2fs -F /dev/sda + ${klibcShrunk}/bin/mount -t ext2 /dev/sda /mnt if test -e /mnt/.debug; then exec ${bash}/bin/sh |