|
@@ -160,8 +160,9 @@ func (d *Driver) Remove(id string) error {
|
|
// Get mounts a device with given id into the root filesystem
|
|
// Get mounts a device with given id into the root filesystem
|
|
func (d *Driver) Get(id, mountLabel string) (string, error) {
|
|
func (d *Driver) Get(id, mountLabel string) (string, error) {
|
|
mp := path.Join(d.home, "mnt", id)
|
|
mp := path.Join(d.home, "mnt", id)
|
|
|
|
+ rootFs := path.Join(mp, "rootfs")
|
|
if count := d.ctr.Increment(mp); count > 1 {
|
|
if count := d.ctr.Increment(mp); count > 1 {
|
|
- return mp, nil
|
|
|
|
|
|
+ return rootFs, nil
|
|
}
|
|
}
|
|
|
|
|
|
uid, gid, err := idtools.GetRootUIDGID(d.uidMaps, d.gidMaps)
|
|
uid, gid, err := idtools.GetRootUIDGID(d.uidMaps, d.gidMaps)
|
|
@@ -186,7 +187,6 @@ func (d *Driver) Get(id, mountLabel string) (string, error) {
|
|
return "", err
|
|
return "", err
|
|
}
|
|
}
|
|
|
|
|
|
- rootFs := path.Join(mp, "rootfs")
|
|
|
|
if err := idtools.MkdirAllAs(rootFs, 0755, uid, gid); err != nil && !os.IsExist(err) {
|
|
if err := idtools.MkdirAllAs(rootFs, 0755, uid, gid); err != nil && !os.IsExist(err) {
|
|
d.ctr.Decrement(mp)
|
|
d.ctr.Decrement(mp)
|
|
d.DeviceSet.UnmountDevice(id, mp)
|
|
d.DeviceSet.UnmountDevice(id, mp)
|