diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-12-18 12:10:35 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-12-18 12:10:35 +0000 |
commit | 798c6f3960e8d9a457916bad9752ebc91d6ba025 (patch) | |
tree | 4ad10dd4d88b8abd2190c871b6139b2d695f3b07 /pkgs/build-support | |
parent | 3e1a06bae17e024e19b256322d819ce3f21caff9 (diff) |
* Include the ext2 and unix modules in the initrd.
* Don't assume that /dev/vda has major 253, since that's not always the case. * Use Linux 2.6.32. svn path=/nixpkgs/trunk/; revision=19031
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/vm/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 8c47fac37b62a..1092812443c68 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -5,7 +5,7 @@ with pkgs; rec { - inherit (kernelPackages_2_6_29) kernel; + inherit (kernelPackages_2_6_32) kernel; klibcShrunk = pkgs.klibcShrunk.override { klibc = klibc_15; }; @@ -14,7 +14,7 @@ rec { modulesClosure = makeModulesClosure { inherit kernel; - rootModules = ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8"]; + rootModules = ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "unix"]; }; @@ -38,7 +38,8 @@ rec { mknod ${dev}/null c 1 3 mknod ${dev}/zero c 1 5 mknod ${dev}/tty c 5 0 - mknod ${dev}/vda b 253 0 + . /sys/class/block/vda/uevent + mknod ${dev}/vda b $MAJOR $MINOR ''; @@ -52,6 +53,7 @@ rec { echo -n > /etc/fstab mount -t proc none /proc + mount -t sysfs none /sys for o in $(cat /proc/cmdline); do case $o in @@ -124,6 +126,9 @@ rec { mkdir -p /fs/proc mount -t proc none /fs/proc + mkdir -p /fs/sys + mount -t sysfs none /fs/sys + mkdir -p /fs/etc ln -sf /proc/mounts /fs/etc/mtab |