Author: eelco
Date: Tue Mar 20 21:45:24 2012
New Revision: 33310
URL: https://nixos.org/websvn/nix/?rev=33310&sc=1
Log:
* I hate asynchronous commands.
Modified:
nixos/trunk/tests/installer.nix
Modified: nixos/trunk/tests/installer.nix
==============================================================================
--- nixos/trunk/tests/installer.nix Tue Mar 20 21:45:15 2012 (r33309)
+++ nixos/trunk/tests/installer.nix Tue Mar 20 21:45:24 2012 (r33310)
@@ -282,9 +282,8 @@
"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 -W /dev/md0", # wait for sync to finish; booting off an
unsynced device tends to fail
"mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1
--raid-devices=2 /dev/vda7 /dev/vda8",
- "mdadm -W /dev/md1",
+ "udevadm settle",
"mkswap -f /dev/md1 -L swap",
"swapon -L swap",
"mkfs.ext3 -L nixos /dev/md0",
@@ -292,6 +291,9 @@
"mkfs.ext3 -L boot /dev/vda1",
"mkdir /mnt/boot",
"mount LABEL=boot /mnt/boot",
+ "udevadm settle",
+ "mdadm -W /dev/md0", # wait for sync to finish; booting off an
unsynced device tends to fail
+ "mdadm -W /dev/md1",
);
'';
fileSystems = rootFS + bootFS;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
