kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Container: Inject into the mount, not the rwPath

Browse source 
For device-mapper setups we can't just push the file into the rwPath.
This commit is contained in:
Alexander Larsson 2013-09-09 15:56:59 +02:00 • committed by Tianon Gravi
parent 0722786600
commit c138801073
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
container.go
View file

@ -297,12 +297,17 @@ func (settings *NetworkSettings) PortMappingAPI() []APIPort {
// Inject the io.Reader at the given path. Note: do not close the reader // Inject the io.Reader at the given path. Note: do not close the reader
func (container *Container) Inject(file io.Reader, pth string) error { func (container *Container) Inject(file io.Reader, pth string) error {
// Make sure the directory exists if err := container.EnsureMounted(); err != nil {
if err := os.MkdirAll(path.Join(container.rwPath(), path.Dir(pth)), 0755); err != nil {
return err return err
} }
// Make sure the directory exists
if err := os.MkdirAll(path.Join(container.RootfsPath(), path.Dir(pth)), 0755); err != nil {
return err
}
// FIXME: Handle permissions/already existing dest // FIXME: Handle permissions/already existing dest
dest, err := os.Create(path.Join(container.rwPath(), pth)) dest, err := os.Create(path.Join(container.RootfsPath(), pth))
if err != nil { if err != nil {
return err return err
} }