[Nix-commits] SVN commit: nix - r23823 - nixos/trunk/modules/virtualisation

[Eelco Dolstra]

Author: eelco
Date: Thu Sep 16 15:24:46 2010
New Revision: 23823
URL: https://svn.nixos.org/websvn/nix/?rev=23823&sc=1

Log:
* Add Xen's udev rules.  This is necessary to get automatically
  created block and network devices to work.

Modified:
   nixos/trunk/modules/virtualisation/xen.nix

Modified: nixos/trunk/modules/virtualisation/xen.nix
==============================================================================
--- nixos/trunk/modules/virtualisation/xen.nix  Thu Sep 16 15:23:12 2010        
(r23822)
+++ nixos/trunk/modules/virtualisation/xen.nix  Thu Sep 16 15:24:46 2010        
(r23823)
@@ -4,7 +4,20 @@
 
 with pkgs.lib;
 
-let cfg = config.virtualisation.xen; in
+let 
+
+  cfg = config.virtualisation.xen; 
+
+  xen = pkgs.xen;
+
+  xendConfig = pkgs.writeText "xend-config.sxp"
+    ''
+      (loglevel DEBUG)
+      (network-script network-bridge)
+      (vif-script vif-bridge)
+    '';
+
+in
 
 {
   ###### interface
@@ -52,12 +65,12 @@
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.xen ];
+    environment.systemPackages = [ xen ];
 
     # Domain 0 requires a pvops-enabled kernel.
     boot.kernelPackages = pkgs.linuxPackages_2_6_32_xen;
 
-    boot.kernelModules = [ "xen_evtchn" "xen_gntdev" ];
+    boot.kernelModules = [ "xen_evtchn" "xen_gntdev" "xen_blkback" 
"xen_netback" "xen_pciback" "blktap" ];
 
     # The radeonfb kernel module causes the screen to go black as soon
     # as it's loaded, so don't load it.
@@ -69,7 +82,7 @@
 
     system.extraSystemBuilderCmds =
       ''
-        ln -s ${pkgs.xen}/boot/xen.gz $out/xen.gz
+        ln -s ${xen}/boot/xen.gz $out/xen.gz
         echo "${toString cfg.bootParams}" > $out/xen-params
       '';
 
@@ -89,12 +102,12 @@
 
         path = 
           [ pkgs.bridge_utils pkgs.gawk pkgs.iproute pkgs.nettools 
-            pkgs.utillinux pkgs.bash pkgs.xen pkgs.pciutils pkgs.procps
+            pkgs.utillinux pkgs.bash xen pkgs.pciutils pkgs.procps
           ];
 
-        preStart = "${pkgs.xen}/sbin/xend start";
+        preStart = "${xen}/sbin/xend start";
 
-        postStop = "${pkgs.xen}/sbin/xend stop";
+        postStop = "${xen}/sbin/xend stop";
       };
 
     # To prevent a race between dhclient and xend's bridge setup
@@ -102,6 +115,20 @@
     # virtual device), start dhclient after xend.
     jobs.dhclient.startOn = mkOverride 50 "started xend";
 
+    environment.etc =
+      [ { source = xendConfig;
+          target = "xen/xend-config.sxp";
+        }
+        { source = "${xen}/etc/xen/scripts";
+          target = "xen/scripts";
+        }
+      ];
+
+    # Xen provides udev rules.
+    services.udev.packages = [ xen ];
+
+    services.udev.path = [ pkgs.bridge_utils pkgs.iproute ];
+
   };
 
 }
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits