From eab091cc119cdc89060b123ac81d78263319078f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 20 Jun 2010 16:15:30 +0000 Subject: [PATCH] * Remove some redundant calls to `udevadm settle'. svn path=/nixos/branches/boot-order/; revision=22345 --- tests/installer.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/installer.nix b/tests/installer.nix index 8577e5b76cd9..bfecca48cc09 100644 --- a/tests/installer.nix +++ b/tests/installer.nix @@ -219,9 +219,7 @@ 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", "udevadm settle", "mkswap /dev/vda1 -L swap", @@ -241,9 +239,7 @@ 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", @@ -266,11 +262,8 @@ in { $machine->mustSucceed( "parted /dev/vda mklabel msdos", "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", "udevadm settle", "pvcreate /dev/vda1 /dev/vda2",