From a076a3c5f2d67beb75cfb18c786da6bc58c451ee Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Thu, 19 Feb 2015 14:43:37 -0700 Subject: [PATCH] Fix cloudinit compilation --- cmd/cloudinit/cloudinit.go | 4 ++-- main.go | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/cloudinit/cloudinit.go b/cmd/cloudinit/cloudinit.go index b720d37f..c5b4b764 100644 --- a/cmd/cloudinit/cloudinit.go +++ b/cmd/cloudinit/cloudinit.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package control +package cloudinit import ( "flag" @@ -118,7 +118,7 @@ var ( } ) -func CloudInit() { +func Main() { failure := false flag.Parse() diff --git a/main.go b/main.go index 57c80c57..5d7f1178 100644 --- a/main.go +++ b/main.go @@ -6,6 +6,7 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/reexec" + "github.com/rancherio/os/cmd/cloudinit" "github.com/rancherio/os/cmd/control" "github.com/rancherio/os/cmd/power" "github.com/rancherio/os/cmd/respawn" @@ -43,7 +44,7 @@ func main() { registerCmd("/usr/bin/respawn", respawn.Main) registerCmd("/usr/sbin/rancherctl", control.Main) registerCmd("/usr/bin/tlsconf", tlsconf.Main) - registerCmd("/usr/bin/cloudinit", control.CloudInit) + registerCmd("/usr/bin/cloudinit", cloudinit.Main) if !reexec.Init() { log.Fatalf("Failed to find an entry point for %s", os.Args[0])