mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #24741 from dsau/24704-create-zfs-directory
Create zfs directory if it doesn't exist at startup.
This commit is contained in:
commit
8a766b859f
1 changed files with 8 additions and 0 deletions
|
@ -99,6 +99,14 @@ func Init(base string, opt []string, uidMaps, gidMaps []idtools.IDMap) (graphdri
|
||||||
return nil, fmt.Errorf("BUG: zfs get all -t filesystem -rHp '%s' should contain '%s'", options.fsName, options.fsName)
|
return nil, fmt.Errorf("BUG: zfs get all -t filesystem -rHp '%s' should contain '%s'", options.fsName, options.fsName)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
rootUID, rootGID, err := idtools.GetRootUIDGID(uidMaps, gidMaps)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("Failed to get root uid/guid: %v", err)
|
||||||
|
}
|
||||||
|
if err := idtools.MkdirAllAs(base, 0700, rootUID, rootGID); err != nil {
|
||||||
|
return nil, fmt.Errorf("Failed to create '%s': %v", base, err)
|
||||||
|
}
|
||||||
|
|
||||||
if err := mount.MakePrivate(base); err != nil {
|
if err := mount.MakePrivate(base); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue