rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-31 22:32:14 +00:00
Code Issues Releases Wiki Activity

Support OEM partition and oem-config.yml

Browse Source
This commit is contained in:
Darren Shepherd
2015-12-19 22:26:09 -07:00
parent cd2829d220
commit 1a95080522
7 changed files with 79 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/disk.go
View File

@@ -18,7 +18,7 @@ var osConfig *CloudConfig
func NewConfig() *CloudConfig {
if osConfig == nil {
osConfig, _ = ReadConfig(nil, true, OsConfigFile)
osConfig, _ = ReadConfig(nil, true, OsConfigFile, OemConfigFile)
}
newCfg := *osConfig
return &newCfg
@@ -200,7 +200,7 @@ func amendContainerNames(c *CloudConfig) (*CloudConfig, error) {
return c, nil
}
func writeToFile(data interface{}, filename string) error {
func WriteToFile(data interface{}, filename string) error {
content, err := yaml.Marshal(data)
if err != nil {
return err
@@ -218,12 +218,12 @@ func saveToDisk(data map[interface{}]interface{}) error {
"rancher.docker.server_cert",
})
err := writeToFile(config, CloudConfigFile)
err := WriteToFile(config, CloudConfigFile)
if err != nil {
return err
}
return writeToFile(private, CloudConfigPrivateFile)
return WriteToFile(private, CloudConfigPrivateFile)
}
func readConfig(bytes []byte, substituteMetadataVars bool, files ...string) (map[interface{}]interface{}, error) {