Author: eelco Date: Tue Jul 13 11:57:12 2010 New Revision: 22576 URL: https://svn.nixos.org/websvn/nix/?rev=22576&sc=1
Log: * swraid test: Fix the alignment of the first logical partition. GNU parted 2.3 barfs on this (http://hydra.nixos.org/build/484788), while 2.2 accepts it. Modified: nixos/trunk/tests/installer.nix Modified: nixos/trunk/tests/installer.nix ============================================================================== --- nixos/trunk/tests/installer.nix Tue Jul 13 11:48:40 2010 (r22575) +++ nixos/trunk/tests/installer.nix Tue Jul 13 11:57:12 2010 (r22576) @@ -283,19 +283,17 @@ { createPartitions = '' $machine->mustSucceed( - "parted /dev/vda mklabel msdos", - "parted /dev/vda -- mkpart primary ext2 1M 30MB", # /boot - "udevadm settle", - "parted /dev/vda -- mkpart extended 30M -1s", # extended partition - "udevadm settle", - "parted /dev/vda -- mkpart logical 30M 1000M", # md0 (root), first device - "udevadm settle", - "parted /dev/vda -- mkpart logical 1024M 2000M", # md0 (root), second device - "udevadm settle", - "parted /dev/vda -- mkpart logical 2048M 2548M", # md1 (swap), first device - "udevadm settle", - "parted /dev/vda -- mkpart logical 2560M 3060M", # md1 (swap), second device + "parted /dev/vda --" + . " mklabel msdos" + . " mkpart primary ext2 1M 30MB" # /boot + . " mkpart extended 30M -1s" + . " mkpart logical 31M 1000M" # md0 (root), first device + . " mkpart logical 1024M 2000M" # md0 (root), second device + . " mkpart logical 2048M 2548M" # md1 (swap), first device + . " mkpart logical 2560M 3060M", # md1 (swap), second device "udevadm settle", + "ls -l /dev/vda* >&2", + "cat /proc/partitions >&2", "mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda5 /dev/vda6", "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda7 /dev/vda8", "mkswap -f /dev/md1 -L swap", _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
