From dfeb26eecf140f36cfe4ef8c9b1302e9f867d6e5 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Tue, 24 Feb 2015 10:45:17 -0700
Subject: [PATCH] Temporary fix for VMware mounting state partition

---
 init/init.go    | 4 ++--
 scripts/package | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/init/init.go b/init/init.go
index a2a2a675..1decdc17 100644
--- a/init/init.go
+++ b/init/init.go
@@ -286,6 +286,8 @@ func RunInit() error {
 			return err
 		},
 		mountCgroups,
+		setResolvConf,
+		createSymlinks,
 		extractModules,
 		loadModules,
 		mountState,
@@ -298,8 +300,6 @@ func RunInit() error {
 		func(cfg *config.Config) error {
 			return cfg.Reload()
 		},
-		setResolvConf,
-		createSymlinks,
 		remountRo,
 		sysInit,
 	}
diff --git a/scripts/package b/scripts/package
index 4cfcefe7..16314b53 100755
--- a/scripts/package
+++ b/scripts/package
@@ -29,7 +29,7 @@ default rancheros
 label rancheros
     kernel /boot/vmlinuz
     initrd /boot/initrd
-    append quiet rancher.password=rancher
+    append quiet rancher.password=rancher rancher.modules=[mptspi]
 EOF
 
 # Copied from boot2docker, thanks.