Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 5d2c6f0353a2c85a755299c28d78cd2de493856f
https://github.com/NixOS/nixpkgs/commit/5d2c6f0353a2c85a755299c28d78cd2de493856f
Author: aszlig <[email protected]>
Date: 2015-05-21 (Thu, 21 May 2015)
Changed paths:
M nixos/tests/installer.nix
Log Message:
-----------
nixos/tests/installer: Allow to pass extra config.
We're going to need it for installer tests where nixos-generate-config
isn't yet able to fully detect the filesystems/hardware. for example for
device mapper configurations other than LVM.
Signed-off-by: aszlig <[email protected]>
Commit: 3b396701fdc054795656562295d1092b72c192db
https://github.com/NixOS/nixpkgs/commit/3b396701fdc054795656562295d1092b72c192db
Author: aszlig <[email protected]>
Date: 2015-05-21 (Thu, 21 May 2015)
Changed paths:
M nixos/tests/installer.nix
Log Message:
-----------
nixos/tests/installer: Allow pre-boot commands.
These commands will be executed directly after the machine is created,
so it gives us the chance to for example type in passphrases using the
virtual keyboard.
Signed-off-by: aszlig <[email protected]>
Commit: 1f34503010bee487b36ed5256fa27e3d2d29c968
https://github.com/NixOS/nixpkgs/commit/1f34503010bee487b36ed5256fa27e3d2d29c968
Author: aszlig <[email protected]>
Date: 2015-05-21 (Thu, 21 May 2015)
Changed paths:
M nixos/tests/installer.nix
Log Message:
-----------
nixos/tests/installer: Add test for LUKS rootfs.
This serves as a regression test for #7859.
It's pretty straightforward, except from the fact that nixos-generate-
config doesn't detect LUKS devices and the "sleep 60".
As for the former, I have tried to add support for LUKS devices for
nixos-generate-config, but it's not so easy as it sounds, because we
need to create a device tree across all possible mappers and/or LVM up
to the "real" device and then decide whether it is relevant to what is
currently mounted. So I guess this is something for the nixpart branch
(see #2079).
And the latter isn't very trivial as well, because the LUKS passphrase
prompt is issued on /dev/console, which is the last "console=..." kernel
parameter (thus the `mkAfter`). So we can't simply grep the log, because
the prompt ends up being on one terminal only (tty0) and using select()
on $machine->{socket} doesn't work very well, because the FD is always
"ready for read". If we would read the FD, we would conflict with
$machine->connect and end up having an inconsistent state. Another idea
would be to use multithreading to do $machine->connect while feeding the
passphrase prompt in a loop and stop the thread once $machine->connect
is done. Turns out that this is not so easy as well, because the threads
need to share the $machine object and of course need to do properly
locking.
In the end I decided to use the "blindly hope that 60 seconds is enough"
approach for now and come up with a better solution later. Other VM
tests surely use sleep as well, but it's $machine->sleep, which is bound
to the clock of the VM, so if the build machine is on high load, a
$machine->sleep gets properly delayed but the timer outside the VM won't
get that delay, so the test is not deterministic.
Tested against the following revisions:
5e3fe39: Before the libgcrypt cleanup (a71f78a) that broke cryptsetup.
69a6848: While cryptsetup was broken (obviously the test failed).
15faa43: After cryptsetup has been switched to OpenSSL (fd588f9).
Signed-off-by: aszlig <[email protected]>
Commit: 7808efe5b7c9abd89d3977825f7115f0a39a5771
https://github.com/NixOS/nixpkgs/commit/7808efe5b7c9abd89d3977825f7115f0a39a5771
Author: aszlig <[email protected]>
Date: 2015-05-21 (Thu, 21 May 2015)
Changed paths:
M nixos/release-combined.nix
M nixos/release.nix
Log Message:
-----------
nixos/release: Add luksroot test to "tested" job.
We want to avoid getting broken LUKS systems into the latest channel, so
let's ensure that the channel update won't happen if LUKS support is
broken again.
Signed-off-by: aszlig <[email protected]>
Compare: https://github.com/NixOS/nixpkgs/compare/478e1d6f1412...7808efe5b7c9_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
