summaryrefslogtreecommitdiffstats
path: root/mount.Info-mount.MountInfo.patch
diff options
context:
space:
mode:
authorJan Chaloupka <jchaloup@redhat.com>2015-11-27 13:23:35 +0100
committerJan Chaloupka <jchaloup@redhat.com>2015-11-27 14:08:20 +0100
commit2700494653bf057fb9a4df85ad6fccbe70f75ba2 (patch)
treeebb4ccf912ec2a01cc8a4ba54844898272927e4d /mount.Info-mount.MountInfo.patch
parent611ae455a174d7af13e57fdc01dffeea1b5a71e4 (diff)
downloadrunc-2700494653bf057fb9a4df85ad6fccbe70f75ba2.tar.gz
runc-2700494653bf057fb9a4df85ad6fccbe70f75ba2.tar.xz
runc-2700494653bf057fb9a4df85ad6fccbe70f75ba2.zip
docker/pkg/mount still contains old mount.MountInfo instead of new mount.Info
resolves: #1286114
Diffstat (limited to 'mount.Info-mount.MountInfo.patch')
-rw-r--r--mount.Info-mount.MountInfo.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/mount.Info-mount.MountInfo.patch b/mount.Info-mount.MountInfo.patch
new file mode 100644
index 0000000..649ed15
--- /dev/null
+++ b/mount.Info-mount.MountInfo.patch
@@ -0,0 +1,25 @@
+From b02a6df2dd9d34717c9bf8a8ab75325380216459 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+Date: Fri, 27 Nov 2015 13:16:06 +0100
+Subject: [PATCH] mount.Info -> mount.MountInfo
+
+---
+ libcontainer/rootfs_linux.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcontainer/rootfs_linux.go b/libcontainer/rootfs_linux.go
+index 5a2fad8..e4377cd 100644
+--- a/libcontainer/rootfs_linux.go
++++ b/libcontainer/rootfs_linux.go
+@@ -426,7 +426,7 @@ func mknodDevice(dest string, node *configs.Device) error {
+ return syscall.Chown(dest, int(node.Uid), int(node.Gid))
+ }
+
+-func getMountInfo(mountinfo []*mount.Info, dir string) *mount.Info {
++func getMountInfo(mountinfo []*mount.MountInfo, dir string) *mount.MountInfo {
+ for _, m := range mountinfo {
+ if m.Mountpoint == dir {
+ return m
+--
+1.9.3
+