From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 16 Jun 2018 09:36:06 +0000 (+0200)
Subject: core-updates: don't restart pakfire at error
X-Git-Tag: v2.21-core122~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=458c7d36cce61af5e2e25d247b46c491627b45fe;p=people%2Fstevee%2Fipfire-2.x.git

core-updates: don't restart pakfire at error

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/core/121/update.sh
index 1d4bd53068..4d19e48f59 100644
--- a/config/rootfiles/core/121/update.sh
+++ b/config/rootfiles/core/121/update.sh
@@ -29,6 +29,8 @@ core=121
 exit_with_error() {
 	# Set last succesfull installed core.
 	echo $(($core-1)) > /opt/pakfire/db/core/mine
+	# don't start pakfire again at error
+	killall -KILL pak_update
 	/usr/bin/logger -p syslog.emerg -t ipfire \
 		"core-update-${core}: $1"
 	exit $2
diff --git a/config/rootfiles/core/122/update.sh b/config/rootfiles/core/122/update.sh
index 6105bf280b..71d197db8f 100644
--- a/config/rootfiles/core/122/update.sh
+++ b/config/rootfiles/core/122/update.sh
@@ -29,6 +29,8 @@ core=122
 exit_with_error() {
 	# Set last succesfull installed core.
 	echo $(($core-1)) > /opt/pakfire/db/core/mine
+	# don't start pakfire again at error
+	killall -KILL pak_update
 	/usr/bin/logger -p syslog.emerg -t ipfire \
 		"core-update-${core}: $1"
 	exit $2