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

Fix registering valid paths in VM tests

Browse Source 
Commit 37b56574e20755e4c58370bb18a3d373d4ae7cfc revealed that the code
to get regInfo from /proc/cmdline was broken.  It only happened to
work because the kernel passes the command line to stage 1 through the
environment, so $regInfo was set anyway.
This commit is contained in:
Eelco Dolstra 2013-01-23 14:35:52 +01:00
parent 37b56574e2
commit ef5108f560
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/virtualisation/qemu-vm.nix
View File

@ -306,11 +306,9 @@ in
# dependency.) # dependency.)
boot.postBootCommands = boot.postBootCommands =
'' ''
( source /proc/cmdline if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then
if [ -n "$regInfo" ]; then ${config.environment.nix}/bin/nix-store --load-db < ''${BASH_REMATCH[1]}
${config.environment.nix}/bin/nix-store --load-db < $regInfo
fi fi
)
''; '';
virtualisation.pathsInNixDB = virtualisation.pathsInNixDB =