From f85fab6b69ef2c20ba016d64ec5344c251b6cdec Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 20 Dec 2017 23:03:12 +0100
Subject: [SSUS] Fix: Only try to install dnbd3-server if included in updater

---
 satellit_upgrader/updater.template.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'satellit_upgrader/updater.template.sh')

diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index b1b7d17..c3b21f4 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -467,8 +467,12 @@ if [ -e "$FILEDIR/rpc.acl" ]; then
 	echo "rpc.acl inserted (dnbd3)"
 fi
 
+if [ -n "$TGZ_DNBD3" ]; then
+	echo "Extracting new dnbd3-server binary"
+	tar -x -C "$PATH_DNBD3" -f "$TMPDIR/$TGZ_DNBD3" || perror "Could not extract $TGZ_DNBD3 to $PATH_DNBD3"
+fi
+
 # ********************** dnbd3.service *******************
-tar -x -C "$PATH_DNBD3" -f "$TMPDIR/$TGZ_DNBD3" || perror "Could not extract $TGZ_DNBD3 to $PATH_DNBD3"
 if [ -e "$FILEDIR/dnbd3-server.service" ]; then
 	echo "* Replacing/writing dnbd3-server.service"
 	cp "$FILEDIR/dnbd3-server.service" "/etc/systemd/system/dnbd3-server.service" \
-- 
cgit v1.2.3-55-g7522