Merge pull request #5134 from tianon/fix-mtab-symlink-error

Fix spurious mtab symlink error when /etc doesn't exist yet
This commit is contained in:
Michael Crosby 2014-04-09 17:54:29 -07:00
commit 14e1a2345d
1 changed files with 3 additions and 3 deletions

View File

@ -272,15 +272,15 @@ func SetupInitLayer(initLayer string) error {
if _, err := os.Stat(path.Join(initLayer, pth)); err != nil {
if os.IsNotExist(err) {
if err := os.MkdirAll(path.Join(initLayer, path.Dir(pth)), 0755); err != nil {
return err
}
switch typ {
case "dir":
if err := os.MkdirAll(path.Join(initLayer, pth), 0755); err != nil {
return err
}
case "file":
if err := os.MkdirAll(path.Join(initLayer, path.Dir(pth)), 0755); err != nil {
return err
}
f, err := os.OpenFile(path.Join(initLayer, pth), os.O_CREATE, 0755)
if err != nil {
return err