rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-27 18:59:17 +00:00
Code Issues Releases Wiki Activity

Add createHomeDir function in console_init.go

Browse Source
This commit is contained in:
Julien Kassar 2017-02-17 11:44:36 -05:00
parent 03532960f3
commit ff35f9a5aa
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cmd/control/console_init.go
View File

@ -31,8 +31,7 @@ type symlink struct {
} }
func ConsoleInitMain() { func ConsoleInitMain() {
err := consoleInitFunc() if err := consoleInitFunc(); err != nil {
if err != nil {
log.Fatal(err) log.Fatal(err)
} }
} }
@ -41,6 +40,17 @@ func consoleInitAction(c *cli.Context) error {
return consoleInitFunc() return consoleInitFunc()
} }
func createHomeDir(homedir string, uid, gid int) {
if _, err := os.Stat(homedir); os.IsNotExist(err) {
if err := os.MkdirAll(homedir, 0755); err != nil {
log.Error(err)
}
if err := os.Chown(homedir, uid, gid); err != nil {
log.Error(err)
}
}
}
func consoleInitFunc() error { func consoleInitFunc() error {
cfg := config.LoadConfig() cfg := config.LoadConfig()
@ -50,23 +60,8 @@ func consoleInitFunc() error {
log.Error(err) log.Error(err)
} }
if _, err := os.Stat(rancherHome); os.IsNotExist(err) { createHomeDir(rancherHome, 1100, 1100)
if err := os.MkdirAll(rancherHome, 0755); err != nil { createHomeDir(dockerHome, 1101, 1101)
log.Error(err)
}
if err := os.Chown(rancherHome, 1100, 1100); err != nil {
log.Error(err)
}
}
if _, err := os.Stat(dockerHome); os.IsNotExist(err) {
if err := os.MkdirAll(dockerHome, 0755); err != nil {
log.Error(err)
}
if err := os.Chown(dockerHome, 1101, 1101); err != nil {
log.Error(err)
}
}
password := config.GetCmdline("rancher.password") password := config.GetCmdline("rancher.password")
if password != "" { if password != "" {