mirror of
https://github.com/containers/podman.git
synced 2025-11-14 18:19:20 +08:00
Vendor latest container/storage to fix overlay mountopt
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #1160 Approved by: mheon
This commit is contained in:
committed by
Atomic Bot
parent
73e3945282
commit
9c806a4a3e
4
vendor/github.com/containers/storage/pkg/mount/mount.go
generated
vendored
4
vendor/github.com/containers/storage/pkg/mount/mount.go
generated
vendored
@@ -39,7 +39,7 @@ func Mounted(mountpoint string) (bool, error) {
|
||||
// specified like the mount or fstab unix commands: "opt1=val1,opt2=val2". See
|
||||
// flags.go for supported option flags.
|
||||
func Mount(device, target, mType, options string) error {
|
||||
flag, _ := parseOptions(options)
|
||||
flag, _ := ParseOptions(options)
|
||||
if flag&REMOUNT != REMOUNT {
|
||||
if mounted, err := Mounted(target); err != nil || mounted {
|
||||
return err
|
||||
@@ -53,7 +53,7 @@ func Mount(device, target, mType, options string) error {
|
||||
// specified like the mount or fstab unix commands: "opt1=val1,opt2=val2". See
|
||||
// flags.go for supported option flags.
|
||||
func ForceMount(device, target, mType, options string) error {
|
||||
flag, data := parseOptions(options)
|
||||
flag, data := ParseOptions(options)
|
||||
return mount(device, target, mType, uintptr(flag), data)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user