1
0
mirror of https://github.com/rancher/os.git synced 2025-09-01 06:40:31 +00:00

Fix two instances where customization isn't respected

This commit is contained in:
Josh Curl
2016-06-28 14:22:13 -07:00
parent d8fc2a7401
commit b09c09edf4
4 changed files with 9 additions and 3 deletions

View File

@@ -1,6 +1,7 @@
package config
import (
"fmt"
"runtime"
"github.com/coreos/coreos-cloudinit/config"
@@ -50,6 +51,8 @@ var (
VERSION string
ARCH string
SUFFIX string
OS_REPO string
OS_BASE string
PrivateKeys = []string{
"rancher.ssh",
"rancher.docker.ca_key",
@@ -69,6 +72,9 @@ func init() {
if SUFFIX == "" && ARCH != "amd64" {
SUFFIX = "_" + ARCH
}
if OS_BASE == "" {
OS_BASE = fmt.Sprintf("%s/os-base:%s%s", OS_REPO, VERSION, SUFFIX)
}
}
type Repository struct {