1
0
mirror of https://github.com/rancher/os.git synced 2025-09-02 15:24:32 +00:00

Fix cloudinit compilation

This commit is contained in:
Darren Shepherd
2015-02-19 14:43:37 -07:00
parent 1ebf37e8be
commit a076a3c5f2
2 changed files with 4 additions and 3 deletions

View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package control package cloudinit
import ( import (
"flag" "flag"
@@ -118,7 +118,7 @@ var (
} }
) )
func CloudInit() { func Main() {
failure := false failure := false
flag.Parse() flag.Parse()

View File

@@ -6,6 +6,7 @@ import (
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/rancherio/os/cmd/cloudinit"
"github.com/rancherio/os/cmd/control" "github.com/rancherio/os/cmd/control"
"github.com/rancherio/os/cmd/power" "github.com/rancherio/os/cmd/power"
"github.com/rancherio/os/cmd/respawn" "github.com/rancherio/os/cmd/respawn"
@@ -43,7 +44,7 @@ func main() {
registerCmd("/usr/bin/respawn", respawn.Main) registerCmd("/usr/bin/respawn", respawn.Main)
registerCmd("/usr/sbin/rancherctl", control.Main) registerCmd("/usr/sbin/rancherctl", control.Main)
registerCmd("/usr/bin/tlsconf", tlsconf.Main) registerCmd("/usr/bin/tlsconf", tlsconf.Main)
registerCmd("/usr/bin/cloudinit", control.CloudInit) registerCmd("/usr/bin/cloudinit", cloudinit.Main)
if !reexec.Init() { if !reexec.Init() {
log.Fatalf("Failed to find an entry point for %s", os.Args[0]) log.Fatalf("Failed to find an entry point for %s", os.Args[0])