Branch: refs/heads/release-15.09
Home: https://github.com/NixOS/nixpkgs
Commit: 4da90c0dbeedc48e51f614bde9cddff69cbe5463
https://github.com/NixOS/nixpkgs/commit/4da90c0dbeedc48e51f614bde9cddff69cbe5463
Author: aszlig <[email protected]>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M nixos/tests/virtualbox.nix
Log Message:
-----------
tests/virtualbox: Add a subtest for host USB.
Unfortunately, we can't test whether USB is really working, but we can
make sure that VirtualBox has access to the USB devices.
This is essentially testing #9736, which I haven't yet been able to
reproduce though, but it makes sense to test it so it won't happen in
future releases.
Signed-off-by: aszlig <[email protected]>
(cherry picked from commit 9a39c2e9434b848175a8763c9d5a5f544603e16d)
Commit: 32e768770b415af463181a55e1f36590fa20aa61
https://github.com/NixOS/nixpkgs/commit/32e768770b415af463181a55e1f36590fa20aa61
Author: Jaka Hudoklin <[email protected]>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M nixos/modules/module-list.nix
A nixos/modules/tasks/filesystems/vboxsf.nix
M nixos/modules/virtualisation/virtualbox-guest.nix
Log Message:
-----------
virtualbox service: add support for vboxsf guest filesystem
Closes #9358
Signed-off-by: Jaka Hudoklin <[email protected]>
Fix reference to bin/mount.vboxsf.
Signed-off-by: aszlig <[email protected]>
(cherry picked from commit 74209a4ca8baedb7bf1b3e3720a9abf132f8c05e)
Commit: b714bd7a1bc8abeec4bbcd75a240a818bcb57398
https://github.com/NixOS/nixpkgs/commit/b714bd7a1bc8abeec4bbcd75a240a818bcb57398
Author: aszlig <[email protected]>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M nixos/modules/tasks/filesystems.nix
Log Message:
-----------
nixos/filesystems: Improve vboxsf default options.
The default options for all file systems currently are
"defaults.relatime", which works well on file systems which support the
relatime option.
Unfortunately, this is not the case for the VirtualBox shared folder
filesystem, so until now, you need to set something like:
fileSystems."/foo" = {
device = "foo";
fsType = "vboxsf";
options = "defaults";
};
Otherwise mounting the file system would fail.
Now, we provide only the "defaults" option to the "vboxsf" file system,
so something like this is enough:
fileSystems."/foo" = {
device = "foo";
fsType = "vboxsf";
};
An alternative to that could be to document that you need to set default
options, but we really should do what users expect instead of forcing
them to look up the documentation as to why this has failed.
Signed-off-by: aszlig <[email protected]>
(cherry picked from commit cd4caed35ae8caf4473b2ac80d826f06e6a2e9e9)
Commit: 45be9edaee8541ad91970c166dcda8dfaf617c9c
https://github.com/NixOS/nixpkgs/commit/45be9edaee8541ad91970c166dcda8dfaf617c9c
Author: aszlig <[email protected]>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M nixos/modules/tasks/filesystems.nix
Log Message:
-----------
nixos/filesystems: Skip check for vboxsf.
We don't even have any means to check a VirtualBox shared folder, so
let's not even try to.
Signed-off-by: aszlig <[email protected]>
(cherry picked from commit f9766f885d74ed5f54f38acdde590d1ac977e4c5)
Commit: df5fe9b64b38f4093288e7414112ef8c7f6fa789
https://github.com/NixOS/nixpkgs/commit/df5fe9b64b38f4093288e7414112ef8c7f6fa789
Author: aszlig <[email protected]>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M nixos/tests/virtualbox.nix
Log Message:
-----------
nixos/tests/virtualbox: Give VMs more memory.
We previously had 1024 MB of memory to fit a VirtualBox VM with 512 MB
plus the memory needed of the VirtualBox host VM. That obviously won't
work for two VirtualBox VMs, which are used for testing networking
between two VirtualBox guests.
Now, we have 2048 MB on the qemu guest (the VirtualBox host) and 768 MB
for each VirtualBox guest. That should be enough to fit in two
VirtualBox guests (I hope).
Signed-off-by: aszlig <[email protected]>
(cherry picked from commit 3e6bb402b18c7b08e85a0468b442c40e4983ab58)
Commit: e1841ac3ec22b6af6ce4434d775973ec23a34319
https://github.com/NixOS/nixpkgs/commit/e1841ac3ec22b6af6ce4434d775973ec23a34319
Author: aszlig <[email protected]>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M nixos/tests/virtualbox.nix
Log Message:
-----------
nixos/tests/virtualbox: Destroy detectvirt VM.
I forgot to do this in da0e642. It shouldn't be a big problem but it's
more clean to destroy the VM once we're done testing.
Signed-off-by: aszlig <[email protected]>
(cherry picked from commit 764a767d5f263e97406c07e6341b387643e1c7ac)
Commit: 310c30089e4088865c6af4e5177fabadf19f93f7
https://github.com/NixOS/nixpkgs/commit/310c30089e4088865c6af4e5177fabadf19f93f7
Author: aszlig <[email protected]>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M nixos/tests/virtualbox.nix
Log Message:
-----------
nixos/tests/virtualbox: Don't parallelize VM boot.
I'm not quite sure why the official Hydra gets a kernel panic in one of
two VMs using the exact same kernels:
https://hydra.nixos.org/build/26339384
Because the kernel panic happens before stage 1, let's wait for the
first VM to boot up and after the bootup is done, start the second one
in hope that it won't trigger the panic.
Oddly enough, whenever I run the test on my own Hydra and on my local
machines, I don't get anything like that.
Signed-off-by: aszlig <[email protected]>
(cherry picked from commit baf1d1dcd77a66450adb54e22b5748566b06a8d7)
Commit: b6d0e5abe5d8d822e7b9ef149a7427145470b767
https://github.com/NixOS/nixpkgs/commit/b6d0e5abe5d8d822e7b9ef149a7427145470b767
Author: aszlig <[email protected]>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M nixos/doc/manual/release-notes/rl-1509.xml
Log Message:
-----------
release-notes/15.09: Use <option/> for options.
There were quite a few configuration options which were tagged via
<literal/>, so in order to keep consistency with other docbook manuals
in the source tree, let's use <option/> here.
Signed-off-by: aszlig <[email protected]>
(cherry picked from commit 02c25001953eaebbdea13fb28a865c958860ce97)
Commit: c512b78f1fd55be10f0cde123ee8260ed9c78680
https://github.com/NixOS/nixpkgs/commit/c512b78f1fd55be10f0cde123ee8260ed9c78680
Author: aszlig <[email protected]>
Date: 2015-09-26 (Sat, 26 Sep 2015)
Changed paths:
M nixos/doc/manual/release-notes/rl-1509.xml
Log Message:
-----------
release-notes/15.09: Document changes for vboxsf.
Since 74209a4 we have initial support for the "vboxsf" (VirtualBox
shared folder) file system support. This will be cherry-picked to
release-15.09 so we need to notice people about the change.
Signed-off-by: aszlig <[email protected]>
(cherry picked from commit 39a03b679ab3ab02c99824d9ec4c6723aaa1a137)
Compare: https://github.com/NixOS/nixpkgs/compare/60aa924d06ab...c512b78f1fd5_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
