diff options
author | Paul Spooren <mail@aparcar.org> | 2019-08-30 12:44:36 -1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-30 12:44:36 -1000 |
commit | c27a9fa2474258566df68249d3128bb1dfb4acbc (patch) | |
tree | c293d2c2604911d8e488de96078aec4bc8840e84 | |
parent | 521c822f1dfa63ad30b7bae718aff5ac3ea63f2c (diff) |
Delete 0003-docker-fix-problem-stopping-container.patch
This patch is upstream https://git.openwrt.org/?p=project/procd.git;a=commit;h=832369078d818d19ab64051fdc8da9e06c90ad88
-rw-r--r-- | patches/procd-master/0003-docker-fix-problem-stopping-container.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/patches/procd-master/0003-docker-fix-problem-stopping-container.patch b/patches/procd-master/0003-docker-fix-problem-stopping-container.patch deleted file mode 100644 index 34e9ca5..0000000 --- a/patches/procd-master/0003-docker-fix-problem-stopping-container.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ac47a6ab039926f2939d07dc55333103c8a6ad0d Mon Sep 17 00:00:00 2001 -From: Mikael Magnusson <mikma@users.sourceforge.net> -Date: Thu, 29 Nov 2018 22:10:42 +0000 -Subject: [PATCH 3/3] docker: fix problem stopping container - ---- - state.c | 13 +------------ - 1 file changed, 1 insertion(+), 12 deletions(-) - -diff --git a/state.c b/state.c -index ccf4104..bd59d7e 100644 ---- a/state.c -+++ b/state.c -@@ -157,18 +157,7 @@ static void state_enter(void) - else - LOG("- reboot -\n"); - -- /* Allow time for last message to reach serial console, etc */ -- sleep(1); -- -- /* We have to fork here, since the kernel calls do_exit(EXIT_SUCCESS) -- * in linux/kernel/sys.c, which can cause the machine to panic when -- * the init process exits... */ -- if (!vfork( )) { /* child */ -- reboot(reboot_event); -- _exit(EXIT_SUCCESS); -- } -- while (1) -- sleep(1); -+ exit(0); - #else - exit(0); - #endif --- -2.17.1 - |