diff --git a/system/options.nix b/system/options.nix
index 3b5353d0807f..0e607a5dd74a 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -420,6 +420,9 @@
       specify a volume label (<literal>label</literal>) for file
       systems that support it, such as ext2/ext3 (see <command>mke2fs
       -L</command>).
+
+      <literal>autocreate</literal> forces <literal>mountPoint</literal> to be created with 
+      <command>mkdir -p</command> .
     ";
   };
 
@@ -671,6 +674,22 @@
         ";
       };
 
+      autorun = mkOption {
+        default = true;
+	description = "
+	  Switch to false to create upstart-job and configuration, 
+	  but not run it automatically
+	";
+      };
+
+      exportConfiguration = mkOption {
+        default = false;
+	description = "
+	  Create /etc/X11/xorg.conf and a file with environment
+	  variables
+	";
+      };
+
       tcpEnable = mkOption {
         default = false;
         description = "
diff --git a/system/system.nix b/system/system.nix
index b1657f741387..c0edff9778d1 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -357,7 +357,8 @@ rec {
       pkgs.upstart # for initctl
     ];
     children = map (x: ((import ./system.nix) 
-      {inherit platform stage2Init; configuration = x;}).system) 
+      {inherit platform stage2Init; 
+        configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system) 
       config.nesting.children; 
     configurationName = config.boot.configurationName;
   }) (pkgs.getConfig ["checkConfigurationOptions"] false)