public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* LVM test: use /dev/disk/by-label/nixos to see whether by-label works

Browse Source 
for LVM.
* Add even more udevadm settle calls.  Urgh.

svn path=/nixos/trunk/; revision=19336
This commit is contained in:
Eelco Dolstra 2010-01-10 19:05:30 +00:00
parent ac8a2ae577
commit 3219ad5587
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/installer.nix
View File

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