* 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.

svn path=/nixos/trunk/; revision=22576
This commit is contained in:
Eelco Dolstra 2010-07-13 11:57:12 +00:00
parent baf54c517d
commit 2a6819e03d

View File

@ -283,19 +283,17 @@ in {
{ createPartitions = { createPartitions =
'' ''
$machine->mustSucceed( $machine->mustSucceed(
"parted /dev/vda mklabel msdos", "parted /dev/vda --"
"parted /dev/vda -- mkpart primary ext2 1M 30MB", # /boot . " mklabel msdos"
"udevadm settle", . " mkpart primary ext2 1M 30MB" # /boot
"parted /dev/vda -- mkpart extended 30M -1s", # extended partition . " mkpart extended 30M -1s"
"udevadm settle", . " mkpart logical 31M 1000M" # md0 (root), first device
"parted /dev/vda -- mkpart logical 30M 1000M", # md0 (root), first device . " mkpart logical 1024M 2000M" # md0 (root), second device
"udevadm settle", . " mkpart logical 2048M 2548M" # md1 (swap), first device
"parted /dev/vda -- mkpart logical 1024M 2000M", # md0 (root), second device . " mkpart logical 2560M 3060M", # md1 (swap), 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
"udevadm settle", "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/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", "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 --raid-devices=2 /dev/vda7 /dev/vda8",
"mkswap -f /dev/md1 -L swap", "mkswap -f /dev/md1 -L swap",