diff options
Diffstat (limited to 'app-containers/lxc')
| -rw-r--r-- | app-containers/lxc/Manifest | 3 | ||||
| -rw-r--r-- | app-containers/lxc/files/lxc-6.0.4-start-Re-introduce-first-SET_DUMPABLE-call.patch | 34 | ||||
| -rw-r--r-- | app-containers/lxc/lxc-6.0.4-r1.ebuild (renamed from app-containers/lxc/lxc-6.0.4.ebuild) | 4 |
3 files changed, 40 insertions, 1 deletions
diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest index 71f7eb1bae2b..278e425434ce 100644 --- a/app-containers/lxc/Manifest +++ b/app-containers/lxc/Manifest @@ -1,3 +1,4 @@ +AUX lxc-6.0.4-start-Re-introduce-first-SET_DUMPABLE-call.patch 1052 BLAKE2B c4a933d01a5ca85789e46964fc010e2a8fdf0ac9aca89b9fa59f78e47a120eb239ae46cb3cc633346adcf4766e481b861368bebd2143539793b7e5bc43d00fbc SHA512 c8bdf3f0bb456c48d4e6902d8a70ccddcf29c87e67d52284e0e4c13db407bd4316d5eb600ae0f59446888c6298b27eabe4cc8137419b2db0716d48fa1cf1dde9 AUX lxc-monitord.service.5.0.0 219 BLAKE2B 5be0ec2b7bd19d661dac97e5d067f0e6d1e297c22c4a642a0b2258003f632263e25349c6d190438f2886064f3202018a452a481e0fb9c9614a5eec5ffa306e39 SHA512 ab63db7a5e0470ac1001e7b05fcbcde3adbe422bdd1030c9e55cd3b1e69855efcf141174f48102ab304035cc4b3497bc569b0f7bc4b231851880872258b28e95 AUX lxc-net.service.5.0.0 304 BLAKE2B bd7125d2f1401d249946f89e0f58966bc426adc09d5759564174d6a666797d687eb85e4b235ff761e1c1b9d87d133cd28fb12f27092da1b0bff2633d4f4fd704 SHA512 06bf3d233cc152d1b67f6c687c9b31bdd5f60e8664e6bcf4234e878cbf840437b82c1e1cf21cc4847f56b57d3ae664f9557264da4d3b3603bef8945a86658be9 AUX lxc.initd.9 3742 BLAKE2B d327816c9d143bd01a98b5f0113a93e001e979456fece6a2f5074c3bda65dac74c0278621a4797bd31b4f16e09fd6680ac8d10adbade9bb525e7ac1ceeec9fcb SHA512 5e3f228ae49bb6a635675c2438e05b6ca842a90a3d0ee76c543a1cb540feff9f577db28951c0e9774e74f6f9ee56b8d974e852afce1c1637b0f44da8cccf28ef @@ -11,5 +12,5 @@ DIST lxc-6.0.4.tar.gz 964064 BLAKE2B f8911993ce333300e68fe3d817cceb49d6c18f83e5f DIST lxc-6.0.4.tar.gz.asc 833 BLAKE2B 4600373e9534515fe3ec0c41ebe5b17ee8c4e7ab125e3a211ed300f0fdd79a04a9c183b903e1b6600d7b7ce4d9f2e66451326c473beb02b4a83a7200764e56e7 SHA512 2efe6e06b33a34fdf7ba1393b5e07aa1a18f189b2e43673b4f9bbdc7cf0fcb9ad47b99ebbd08e910e139047d54b1104f098cbbef586796767b9dd1a4a99ca748 EBUILD lxc-5.0.3.ebuild 5052 BLAKE2B 99a20e705617194a9e38ec6dabbc52fd43dbd5615a6b00379921f4ba200c2110f666878c00195917109f37cfed961258978b79bc3db0814986c36429537e660c SHA512 050ebb35250bd258a602ee84f9f1b1c35531caa0c3f9954bb8380927a8c262ffd66776cc0af643aaf69a7e0c51dccfe82bb2e3993e264ba2a0c91de8bd94faf5 EBUILD lxc-6.0.3.ebuild 5412 BLAKE2B 37cb83c04bbf15d7f697ce901248aaf96f83110cdc315c77f6331ff6157896218a6523c99390f9c0907bab4b263103344bd5e9d18f142955d25a674112305104 SHA512 95b0e84ceb394986fa4eb6e348caa31240d5b91fe6bdacb264be1a0dd2769627a2f18839e8d3814fad84743237a848f006e287c5d27ac85623b0c1da1bea089b -EBUILD lxc-6.0.4.ebuild 5414 BLAKE2B 222f39b4973fccf8b95b033cf87ae671d2434d517e8c3a3747d113c0cf3e78c532a7e3b503917dafa70dca5ffc66fce58addaf2fcf64d0ddbd623af34ab88b3a SHA512 c3e52da189e8706fdfaa02156fac35972b38743a1d1843eb640f1297982f49aa0035193aa80e1ff01dfdb8c406c5710af6856f193a3439c6e1d1bc627580616a +EBUILD lxc-6.0.4-r1.ebuild 5496 BLAKE2B ea2c4f575bcabbae70a46d3ba3ba3f5c94145c666e6febd832d637d9d7eb303b70c6db5481c4fe7c7cfe4711c6b6e558c82001dee9290e55b1a3d6c2b01e2296 SHA512 12f8627aefc7b9ed724aee6f54dfc2b15f10bd3da24474a5db722a2bea92d56332df02094eec994c0df3ff4c2aa4061f085f92b531b955976ed734cb7ff4b72a MISC metadata.xml 629 BLAKE2B 1dde5fefd2199c46a6b2714be94513f02494baf8d382195f79452c749cfe82c90ee1e353428d5d661cb991b25a6d9774605e292b0a4e1321e0a3d269c4eb3334 SHA512 245d00b1e44762fd76ad1978763158438db9a685f383575bce93cf4aac82358331cb41ee7fabc142849a90f8fc116cf14a646e254e6b5be4d46fa90798a48ff6 diff --git a/app-containers/lxc/files/lxc-6.0.4-start-Re-introduce-first-SET_DUMPABLE-call.patch b/app-containers/lxc/files/lxc-6.0.4-start-Re-introduce-first-SET_DUMPABLE-call.patch new file mode 100644 index 000000000000..59475cf71039 --- /dev/null +++ b/app-containers/lxc/files/lxc-6.0.4-start-Re-introduce-first-SET_DUMPABLE-call.patch @@ -0,0 +1,34 @@ +From 2663712e8fa8f37e0bb873185e2d4526dc644764 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org> +Date: Sat, 5 Apr 2025 01:11:18 -0400 +Subject: [PATCH] start: Re-introduce first SET_DUMPABLE call +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without it, we're running into issues with complex hooks like nvidia. + +Signed-off-by: Stéphane Graber <stgraber@stgraber.org> +--- + src/lxc/start.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/lxc/start.c b/src/lxc/start.c +index f28bceaba..ee4bf4003 100644 +--- a/src/lxc/start.c ++++ b/src/lxc/start.c +@@ -1125,6 +1125,11 @@ static int do_start(void *data) + if (!lxc_switch_uid_gid(nsuid, nsgid)) + goto out_warn_father; + ++ ret = prctl(PR_SET_DUMPABLE, prctl_arg(1), prctl_arg(0), ++ prctl_arg(0), prctl_arg(0)); ++ if (ret < 0) ++ goto out_warn_father; ++ + /* set{g,u}id() clears deathsignal */ + ret = lxc_set_death_signal(SIGKILL, handler->monitor_pid, status_fd); + if (ret < 0) { +-- +2.48.1 + diff --git a/app-containers/lxc/lxc-6.0.4.ebuild b/app-containers/lxc/lxc-6.0.4-r1.ebuild index d418449a7964..995c5160812c 100644 --- a/app-containers/lxc/lxc-6.0.4.ebuild +++ b/app-containers/lxc/lxc-6.0.4-r1.ebuild @@ -72,6 +72,10 @@ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt ) +PATCHES=( + "${FILESDIR}"/${P}-start-Re-introduce-first-SET_DUMPABLE-call.patch +) + pkg_setup() { linux-info_pkg_setup } |