From fb8b4a88fb1c5533f276be4787acff71bdffd0f3 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Thu, 19 Feb 2015 13:58:29 -0700 Subject: [PATCH] Move sysinit to cmd --- {sysinit => cmd/sysinit}/sysinit.go | 2 +- main.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename {sysinit => cmd/sysinit}/sysinit.go (99%) diff --git a/sysinit/sysinit.go b/cmd/sysinit/sysinit.go similarity index 99% rename from sysinit/sysinit.go rename to cmd/sysinit/sysinit.go index de92c1ff..9071d033 100644 --- a/sysinit/sysinit.go +++ b/cmd/sysinit/sysinit.go @@ -14,7 +14,7 @@ import ( "github.com/rancherio/os/util" ) -func SysInit() { +func Main() { if err := sysInit(); err != nil { log.Fatal(err) } diff --git a/main.go b/main.go index dfa1132f..57c80c57 100644 --- a/main.go +++ b/main.go @@ -9,10 +9,10 @@ import ( "github.com/rancherio/os/cmd/control" "github.com/rancherio/os/cmd/power" "github.com/rancherio/os/cmd/respawn" + "github.com/rancherio/os/cmd/sysinit" "github.com/rancherio/os/cmd/systemdocker" "github.com/rancherio/os/cmd/tlsconf" osInit "github.com/rancherio/os/init" - "github.com/rancherio/os/sysinit" ) func registerCmd(cmd string, mainFunc func()) { @@ -35,7 +35,7 @@ func registerCmd(cmd string, mainFunc func()) { func main() { registerCmd("/init", osInit.MainInit) - registerCmd(osInit.SYSINIT, sysinit.SysInit) + registerCmd(osInit.SYSINIT, sysinit.Main) registerCmd("/usr/bin/system-docker", systemdocker.Main) registerCmd("/sbin/poweroff", power.PowerOff) registerCmd("/sbin/reboot", power.Reboot)