Author: sandervanderburg
Date: Mon Sep 13 14:34:27 2010
New Revision: 23760
URL: https://svn.nixos.org/websvn/nix/?rev=23760&sc=1

Log:
Replace the AUFS stuff, by virtualization.writableStore = true;

Modified:
   disnix/disnix/trunk/release.nix

Modified: disnix/disnix/trunk/release.nix
==============================================================================
--- disnix/disnix/trunk/release.nix     Mon Sep 13 14:23:36 2010        (r23759)
+++ disnix/disnix/trunk/release.nix     Mon Sep 13 14:34:27 2010        (r23760)
@@ -54,23 +54,9 @@
          {config, pkgs, ...}:
            
          {
-           # 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.enable = true;
             services.dbus.packages = [ disnix ];
            services.sshd.enable = true;
            
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to