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

Merge pull request #1634 from juliengk/create_home_dir

Browse Source 
Create home dir
This commit is contained in:
Sven Dowideit
2017-02-18 07:50:54 +10:00
committed by GitHub
parent 62cef9bbd2 ff35f9a5aa
commit f041ceefc5
1 changed files with 14 additions and 19 deletions
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() {
err := consoleInitFunc()
if err != nil {
if err := consoleInitFunc(); err != nil {
log.Fatal(err)
}
}
@@ -41,6 +40,17 @@ func consoleInitAction(c *cli.Context) error {
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 {
cfg := config.LoadConfig()
@@ -50,23 +60,8 @@ func consoleInitFunc() error {
log.Error(err)
}
if _, err := os.Stat(rancherHome); os.IsNotExist(err) {
if err := os.MkdirAll(rancherHome, 0755); err != nil {
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)
}
}
createHomeDir(rancherHome, 1100, 1100)
createHomeDir(dockerHome, 1101, 1101)
password := config.GetCmdline("rancher.password")
if password != "" {