From 3219ad5587ccf4dd530e21ae93fbc05f416173bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 10 Jan 2010 19:05:30 +0000
Subject: [PATCH] * LVM test: use /dev/disk/by-label/nixos to see whether
 by-label works   for LVM. * Add even more udevadm settle calls.  Urgh.

svn path=/nixos/trunk/; revision=19336
---
 tests/installer.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/installer.nix b/tests/installer.nix
index 0f5b828f108d..7adabe936010 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -217,9 +217,10 @@ in {
         ''
           $machine->mustSucceed(
               "parted /dev/vda mklabel msdos",
+              "udevadm settle",
               "parted /dev/vda -- mkpart primary linux-swap 1M 1024M",
+              "udevadm settle",
               "parted /dev/vda -- mkpart primary ext2 1024M -1s",
-              # It can take udev a moment to create /dev/vda*.
               "udevadm settle",
               "mkswap /dev/vda1 -L swap",
               "swapon -L swap",
@@ -238,7 +239,9 @@ in {
           $machine->mustSucceed(
               "parted /dev/vda mklabel msdos",
               "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
+              "udevadm settle",
               "parted /dev/vda -- mkpart primary linux-swap 50MB 1024M",
+              "udevadm settle",
               "parted /dev/vda -- mkpart primary ext2 1024M -1s", # /
               "udevadm settle",
               "mkswap /dev/vda2 -L swap",
@@ -263,6 +266,7 @@ in {
               "parted /dev/vda -- mkpart primary 1M 2048M", # first PV
               "udevadm settle",
               "parted /dev/vda -- set 1 lvm on",
+              "udevadm settle",
               "parted /dev/vda -- mkpart primary 2048M -1s", # second PV
               "udevadm settle",
               "parted /dev/vda -- set 2 lvm on",
@@ -276,12 +280,7 @@ in {
               "mount LABEL=nixos /mnt",
           );
         '';
-      fileSystems =
-        ''
-          { mountPoint = "/";
-            device = " /dev/MyVolGroup/nixos";
-          }
-        '';
+      fileSystems = rootFS;
     };
   
 }