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

Merge pull request #2006 from SvenDowideit/fix-integration-tests

Browse Source 
Fix integration tests
This commit is contained in:
Sven Dowideit
2017-07-21 16:24:56 +10:00
committed by GitHub
parent 2719d8a8e4 cc58b8c6b2
commit c291763251
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
init/init.go
View File

@@ -384,10 +384,17 @@ func RunInit() error {
config.CfgFuncData{"mount OEM2", mountOem},
config.CfgFuncData{"write cfg and log files", func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
for name, content := range configFiles {
if err := os.MkdirAll(filepath.Dir(name), os.ModeDir|0700); err != nil {
dirMode := os.ModeDir | 0755
fileMode := os.FileMode(0444)
if strings.HasPrefix(name, "/var/lib/rancher/conf/") {
// only make the conf files harder to get to
dirMode = os.ModeDir | 0700
fileMode = os.FileMode(0400)
}
if err := os.MkdirAll(filepath.Dir(name), dirMode); err != nil {
log.Error(err)
}
if err := util.WriteFileAtomic(name, content, 400); err != nil {
if err := util.WriteFileAtomic(name, content, fileMode); err != nil {
log.Error(err)
}
log.Infof("Wrote log to %s", name)