Author: eelco Date: 2010-06-20 16:15:30 +0000 (Sun, 20 Jun 2010) New Revision: 22345
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22345&view=rev Modified: nixos/branches/boot-order/tests/installer.nix Log: * Remove some redundant calls to `udevadm settle'. Changes: Modified: nixos/branches/boot-order/tests/installer.nix =================================================================== --- nixos/branches/boot-order/tests/installer.nix 2010-06-20 16:05:15 UTC (rev 22344) +++ nixos/branches/boot-order/tests/installer.nix 2010-06-20 16:15:30 UTC (rev 22345) @@ -219,9 +219,7 @@ '' $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 @@ $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 @@ $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", _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
