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

qemu-vm.nix: Use ext4 instead of ext3

Browse Source
This commit is contained in:
Eelco Dolstra 2012-08-08 14:20:41 -04:00
parent da787e3071
commit 5ae6385175
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modules/virtualisation/qemu-vm.nix
View File

@ -211,7 +211,7 @@ let
. /sys/class/block/vda1/uevent . /sys/class/block/vda1/uevent
mknod /dev/vda1 b $MAJOR $MINOR mknod /dev/vda1 b $MAJOR $MINOR
. /sys/class/block/vda/uevent . /sys/class/block/vda/uevent
${pkgs.e2fsprogs}/sbin/mkfs.ext3 -L boot /dev/vda1 ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L boot /dev/vda1
${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1 ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
# Mount /boot. # Mount /boot.
@ -264,7 +264,7 @@ in
# initialise. # initialise.
FSTYPE=$(blkid -o value -s TYPE /dev/vda || true) FSTYPE=$(blkid -o value -s TYPE /dev/vda || true)
if test -z "$FSTYPE"; then if test -z "$FSTYPE"; then
mke2fs -t ext3 /dev/vda mke2fs -t ext4 /dev/vda
fi fi
''; '';
@ -331,7 +331,7 @@ in
] ++ optional cfg.useBootLoader ] ++ optional cfg.useBootLoader
{ mountPoint = "/boot"; { mountPoint = "/boot";
device = "/dev/disk/by-label/boot"; device = "/dev/disk/by-label/boot";
fsType = "ext3"; fsType = "ext4";
options = "ro"; options = "ro";
noCheck = true; # fsck fails on a r/o filesystem noCheck = true; # fsck fails on a r/o filesystem
}); });
@ -386,21 +386,21 @@ in
# Wireless won't work in the VM. # Wireless won't work in the VM.
networking.wireless.enable = mkOverride 50 false; networking.wireless.enable = mkOverride 50 false;
system.requiredKernelConfig = with config.lib.kernelConfig; [ system.requiredKernelConfig = with config.lib.kernelConfig;
(isEnabled "VIRTIO_BLK") [ (isEnabled "VIRTIO_BLK")
(isEnabled "VIRTIO_PCI") (isEnabled "VIRTIO_PCI")
(isEnabled "VIRTIO_NET") (isEnabled "VIRTIO_NET")
(isEnabled "EXT3_FS") (isEnabled "EXT4_FS")
(isEnabled "CIFS") (isEnabled "CIFS")
(isYes "BLK_DEV") (isYes "BLK_DEV")
(isYes "PCI") (isYes "PCI")
(isYes "EXPERIMENTAL") (isYes "EXPERIMENTAL")
(isYes "NETDEVICES") (isYes "NETDEVICES")
(isYes "NET_CORE") (isYes "NET_CORE")
(isYes "INET") (isYes "INET")
(isYes "NETWORK_FILESYSTEMS") (isYes "NETWORK_FILESYSTEMS")
] ++ optional (!cfg.graphics) [ ] ++ optional (!cfg.graphics) [
(isYes "SERIAL_8250_CONSOLE") (isYes "SERIAL_8250_CONSOLE")
(isYes "SERIAL_8250") (isYes "SERIAL_8250")
]; ];
} }