Disassembler/Spotter-VM
1
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Patch lxc-attach to return correct returncode

Browse Source
This commit is contained in:
Disassembler 2020-03-19 22:36:59 +01:00
parent dadda1c175
commit 36181e3593
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apk/lxc/APKBUILD
View File

@ -42,6 +42,7 @@ source="https://linuxcontainers.org/downloads/lxc/lxc-$_pkgver.tar.gz
cgroups-initialize-cpuset-properly.patch cgroups-initialize-cpuset-properly.patch
network-restore-ability-to-move-nl80211-devices.patch network-restore-ability-to-move-nl80211-devices.patch
execute-attach-user-group.patch execute-attach-user-group.patch
attach-returncode.patch
lxc.initd lxc.initd
lxc.confd lxc.confd
" "
@ -172,5 +173,6 @@ sha512sums="4b3046fc6c4aa497fb26bd45839e60de503184af86d3966e796d14e619203536b9a9
2bebe6cc24987354b6e7dc9003c3a4df450ca10263e6dc0e9313977fdfc2eb57c0d68560da4d1071c8de2f8e3e394ed3ca17af445bea524daa5f8ae8955b3ba6 cgroups-initialize-cpuset-properly.patch 2bebe6cc24987354b6e7dc9003c3a4df450ca10263e6dc0e9313977fdfc2eb57c0d68560da4d1071c8de2f8e3e394ed3ca17af445bea524daa5f8ae8955b3ba6 cgroups-initialize-cpuset-properly.patch
d302b7296918680901d034dc12ae0687dbbc65766800a9f7256e661f638d3dcad66bcc737aec2c6de8c27d3b9c08833e00420c2064f356d6d73efda9ae9bd707 network-restore-ability-to-move-nl80211-devices.patch d302b7296918680901d034dc12ae0687dbbc65766800a9f7256e661f638d3dcad66bcc737aec2c6de8c27d3b9c08833e00420c2064f356d6d73efda9ae9bd707 network-restore-ability-to-move-nl80211-devices.patch
a26cd718760e73309a686242b03c5de5ceff17ab9c348438cd19d2d875696e5c788f0e04d66dd01e08449754c14ce2b7cc1dfc1bac2a64429ccf4462f8aa93a5 execute-attach-user-group.patch a26cd718760e73309a686242b03c5de5ceff17ab9c348438cd19d2d875696e5c788f0e04d66dd01e08449754c14ce2b7cc1dfc1bac2a64429ccf4462f8aa93a5 execute-attach-user-group.patch
565b7c1774b19f66cc3435557325b75c85203bae4e53db1677580f4b93c4fb2db7f9bd9dd02b956b18bc2730b8645984e790f27162510d642ce7647df21febc0 attach-returncode.patch
b74ffe7c3e8f193265a90ffeb6e5743b1212bc1416b898e5a7e59ddd7f06fc77dc34e2dcbb3614038ac6222a95e2b9beb9f03ab734c991837203ab626b1b091f lxc.initd b74ffe7c3e8f193265a90ffeb6e5743b1212bc1416b898e5a7e59ddd7f06fc77dc34e2dcbb3614038ac6222a95e2b9beb9f03ab734c991837203ab626b1b091f lxc.initd
91de43db5369a9e10102933514d674e9c875218a1ff2910dd882e5b9c308f9e430deacb13d1d7e0b2ed1ef682d0bb035aa6f8a6738f54fa2ca3a05acce04e467 lxc.confd" 91de43db5369a9e10102933514d674e9c875218a1ff2910dd882e5b9c308f9e430deacb13d1d7e0b2ed1ef682d0bb035aa6f8a6738f54fa2ca3a05acce04e467 lxc.confd"

15
apk/lxc/attach-returncode.patch Normal file
View File

@ -0,0 +1,15 @@
--- a/src/lxc/tools/lxc_attach.c
+++ b/src/lxc/tools/lxc_attach.c
@@ -385,10 +385,9 @@
ret = lxc_wait_for_pid_status(pid);
if (ret < 0)
goto out;
-
- if (WIFEXITED(ret))
- wexit = WEXITSTATUS(ret);
}
+ if (WIFEXITED(ret))
+ wexit = WEXITSTATUS(ret);
out:
lxc_container_put(c);

2
lxc-services/mariadb/image
View File

@ -18,5 +18,5 @@ EOF
COPY image.d COPY image.d
CMD /bin/s6-svscan /etc/services.d CMD /bin/s6-svscan /etc/services.d
READY /bin/sh -c "echo 'SELECT version()'| mysql" READY /usr/bin/test -e /run/mysqld/mysqld.sock
HALT SIGTERM HALT SIGTERM