summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Magnusson <mikma@users.sourceforge.net>2020-01-27 16:10:52 +0000
committerMikael Magnusson <mikma@users.sourceforge.net>2020-01-27 16:24:17 +0000
commitdfdcd99b9b8d776b3a94268e938dbd3bf2165f83 (patch)
treef5d7a11fd1ce8e9ef592315f3605478ef94d1730
parent1c134e19f00c9dc20a5a81db5d1e007e25ee88d3 (diff)
Remove procd patch from procd-master
The patch is not needed since commit e117ea30 in procd: "state: fix reboot causing shutdown inside LXC container" Closes: #21
-rwxr-xr-xbuild.sh4
-rw-r--r--patches/procd-master/0001-state-support-reboot-of-containers.patch28
2 files changed, 3 insertions, 29 deletions
diff --git a/build.sh b/build.sh
index 1b7584f..f74a75d 100755
--- a/build.sh
+++ b/build.sh
@@ -240,7 +240,9 @@ build_tarball() {
fi
local allpkgs="${packages}"
test -d $pkgdir && for pkg in $pkgdir/*.ipk; do
- allpkgs="${allpkgs} $pkg"
+ if [ -e "$pkg" ]; then
+ allpkgs="${allpkgs} $pkg"
+ fi
done
local cmd="scripts/build_rootfs.sh"
diff --git a/patches/procd-master/0001-state-support-reboot-of-containers.patch b/patches/procd-master/0001-state-support-reboot-of-containers.patch
deleted file mode 100644
index 867c256..0000000
--- a/patches/procd-master/0001-state-support-reboot-of-containers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d684a1f21883c8ffc43c9aff8b1d2bb526e15cc3 Mon Sep 17 00:00:00 2001
-From: Mikael Magnusson <mikma@users.sourceforge.net>
-Date: Mon, 2 Sep 2019 14:53:20 +0200
-Subject: [PATCH] state: support reboot of containers
-
----
- state.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/state.c b/state.c
-index 4737d01..0ca3dca 100644
---- a/state.c
-+++ b/state.c
-@@ -172,8 +172,10 @@ static void state_enter(void)
-
- while (1)
- sleep(1);
-- } else
-+ } else {
-+ reboot(reboot_event);
- exit(0);
-+ }
- #else
- exit(0);
- #endif
---
-2.17.1
-