jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #307 from estesp/no-remount-if-unecessary 

Only remount if requested flags differ from current
This commit is contained in:
Alexander Morozov 2015-09-30 11:40:06 -07:00
parent 74ded3660b 97f5ee4e6a
commit fba07bce72
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcontainer/rootfs_linux.go
View File

@ -171,9 +171,14 @@ func mountToRootfs(m *configs.Mount, rootfs, mountLabel string) error {
return err
}
// bind mount won't change mount options, we need remount to make mount options effective.
if err := remount(m, rootfs); err != nil {
return err
// first check that we have non-default options required before attempting a remount
if m.Flags&^(syscall.MS_REC|syscall.MS_REMOUNT|syscall.MS_BIND) != 0 {
// only remount if unique mount options are set
if err := remount(m, rootfs); err != nil {
return err
}
}
if m.Relabel != "" {
if err := label.Validate(m.Relabel); err != nil {
return err