mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
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:
commit
14e1a2345d
1 changed files with 3 additions and 3 deletions
|
@ -272,15 +272,15 @@ func SetupInitLayer(initLayer string) error {
|
||||||
|
|
||||||
if _, err := os.Stat(path.Join(initLayer, pth)); err != nil {
|
if _, err := os.Stat(path.Join(initLayer, pth)); err != nil {
|
||||||
if os.IsNotExist(err) {
|
if os.IsNotExist(err) {
|
||||||
|
if err := os.MkdirAll(path.Join(initLayer, path.Dir(pth)), 0755); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
switch typ {
|
switch typ {
|
||||||
case "dir":
|
case "dir":
|
||||||
if err := os.MkdirAll(path.Join(initLayer, pth), 0755); err != nil {
|
if err := os.MkdirAll(path.Join(initLayer, pth), 0755); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
case "file":
|
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)
|
f, err := os.OpenFile(path.Join(initLayer, pth), os.O_CREATE, 0755)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
Loading…
Add table
Reference in a new issue