Browse Source

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
Mikael Magnusson 5 years ago
parent
commit
dfdcd99b9b
2 changed files with 3 additions and 29 deletions
  1. 3 1
      build.sh
  2. 0 28
      patches/procd-master/0001-state-support-reboot-of-containers.patch

+ 3 - 1
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"

+ 0 - 28
patches/procd-master/0001-state-support-reboot-of-containers.patch

@@ -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
-