Author: sandervanderburg
Date: Wed Oct 20 15:35:13 2010
New Revision: 24390
URL: https://svn.nixos.org/websvn/nix/?rev=24390&sc=1
Log:
Removed all the dirty hacks to get a writable store, since it is supported with
the virtualisation.writableStore nowadays
Modified:
disnix/DisnixWebService/trunk/release.nix
Modified: disnix/DisnixWebService/trunk/release.nix
==============================================================================
--- disnix/DisnixWebService/trunk/release.nix Wed Oct 20 15:29:43 2010
(r24389)
+++ disnix/DisnixWebService/trunk/release.nix Wed Oct 20 15:35:13 2010
(r24390)
@@ -53,7 +53,7 @@
tests =
{ nixos ? /etc/nixos/nixos
, disnix ? (import ../../disnix/trunk/release.nix {}).build {}
- , disnix_activation_scripts ? (import
../../disnix-activation-scripts-nixos/trunk/release.nix {}).build {}
+ , disnix_activation_scripts ? (import
../../disnix-activation-scripts/trunk/release.nix {}).build {}
}:
let
@@ -69,22 +69,8 @@
{pkgs, config, ...}:
{
- # Make the Nix store in this VM writable using AUFS. Use Linux
- # 2.6.27 because 2.6.32 doesn't work (probably we need AUFS2).
- # This should probably be moved to qemu-vm.nix.
-
- boot.kernelPackages = (if pkgs ? linuxPackages then
- pkgs.linuxPackages_2_6_27 else pkgs.kernelPackages_2_6_27);
- boot.extraModulePackages = [ config.boot.kernelPackages.aufs ];
- boot.initrd.availableKernelModules = [ "aufs" ];
-
- boot.initrd.postMountCommands =
- ''
- mkdir /mnt-store-tmpfs
- mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
- mount -t aufs -o
dirs=/mnt-store-tmpfs=rw:$targetRoot/nix/store=rr none $targetRoot/nix/store
- '';
-
+ virtualisation.writableStore = true;
+
services.dbus.enable = true;
services.dbus.packages = [ disnix ];
@@ -118,22 +104,7 @@
{pkgs, config, ...}:
{
- # Make the Nix store in this VM writable using AUFS. Use Linux
- # 2.6.27 because 2.6.32 doesn't work (probably we need AUFS2).
- # This should probably be moved to qemu-vm.nix.
-
- boot.kernelPackages = (if pkgs ? linuxPackages then
- pkgs.linuxPackages_2_6_27 else pkgs.kernelPackages_2_6_27);
- boot.extraModulePackages = [ config.boot.kernelPackages.aufs ];
- boot.initrd.availableKernelModules = [ "aufs" ];
-
- boot.initrd.postMountCommands =
- ''
- mkdir /mnt-store-tmpfs
- mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
- mount -t aufs -o
dirs=/mnt-store-tmpfs=rw:$targetRoot/nix/store=rr none $targetRoot/nix/store
- '';
-
+ virtualisation.writableStore = true;
environment.systemPackages = [ disnix DisnixWebService
pkgs.stdenv ];
};
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
