public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Include the ext2 and unix modules in the initrd.

Browse Source 
* 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
This commit is contained in:
Eelco Dolstra 2009-12-18 12:10:35 +00:00
parent 3e1a06bae1
commit 798c6f3960
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/build-support/vm/default.nix
View File

@ -5,7 +5,7 @@ with pkgs;
rec { rec {
inherit (kernelPackages_2_6_29) kernel; inherit (kernelPackages_2_6_32) kernel;
klibcShrunk = pkgs.klibcShrunk.override { klibc = klibc_15; }; klibcShrunk = pkgs.klibcShrunk.override { klibc = klibc_15; };
@ -14,7 +14,7 @@ rec {
modulesClosure = makeModulesClosure { modulesClosure = makeModulesClosure {
inherit kernel; 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}/null c 1 3
mknod ${dev}/zero c 1 5 mknod ${dev}/zero c 1 5
mknod ${dev}/tty c 5 0 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 echo -n > /etc/fstab
mount -t proc none /proc mount -t proc none /proc
mount -t sysfs none /sys
for o in $(cat /proc/cmdline); do for o in $(cat /proc/cmdline); do
case $o in case $o in
@ -124,6 +126,9 @@ rec {
mkdir -p /fs/proc mkdir -p /fs/proc
mount -t proc none /fs/proc mount -t proc none /fs/proc
mkdir -p /fs/sys
mount -t sysfs none /fs/sys
mkdir -p /fs/etc mkdir -p /fs/etc
ln -sf /proc/mounts /fs/etc/mtab ln -sf /proc/mounts /fs/etc/mtab