fix issues with shell detection on attach

[lxc.git] / debian / patches / pve / 0003-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch

diff --git a/debian/patches/pve/0003-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch b/debian/patches/pve/0003-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch
index 7f13f8c7f1a0973b1d6b13d590b453d24a7cd326..74835c3ed433e7bc61e08ccb4da21e3d79472f66 100644 (file)
--- a/debian/patches/pve/0003-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch
+++ b/debian/patches/pve/0003-PVE-Config-deny-rw-mounting-of-sys-and-proc.patch
@@ -14,7 +14,7 @@ if a rw /sys is desired, set "lxc.mount.auto" accordingly
  2 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/config/apparmor/abstractions/container-base b/config/apparmor/abstractions/container-base
-index 07747655..fbd70fdf 100644
+index 077476559..fbd70fdf5 100644
 --- a/config/apparmor/abstractions/container-base
 +++ b/config/apparmor/abstractions/container-base
 @@ -82,7 +82,6 @@
@@ -38,7 +38,7 @@ index 07747655..fbd70fdf 100644
    # FIXME: This currently doesn't work due to the apparmor parser treating those as allowing all mounts.
  #  mount options=(rw,make-slave) -> **,
 diff --git a/config/apparmor/abstractions/container-base.in b/config/apparmor/abstractions/container-base.in
-index 1a3ead89..39abf348 100644
+index 1a3ead89a..39abf348c 100644
 --- a/config/apparmor/abstractions/container-base.in
 +++ b/config/apparmor/abstractions/container-base.in
 @@ -82,7 +82,6 @@
@@ -62,5 +62,5 @@ index 1a3ead89..39abf348 100644
    # FIXME: This currently doesn't work due to the apparmor parser treating those as allowing all mounts.
  #  mount options=(rw,make-slave) -> **,
 -- 
-2.11.0
+2.20.1