summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2019-10-28 16:08:17 +0100
committerSimon Rettberg2019-10-28 16:08:17 +0100
commitb3d688f41d3c84ba0bb265aebaa7fa906fcfa4e6 (patch)
treee3a1b666e25cface2273c6c6213575ceac144dfe
parent[SSPS] Build dnbd3-server from source instead of binary download (diff)
downloadsetup-scripts-b3d688f41d3c84ba0bb265aebaa7fa906fcfa4e6.tar.gz
setup-scripts-b3d688f41d3c84ba0bb265aebaa7fa906fcfa4e6.tar.xz
setup-scripts-b3d688f41d3c84ba0bb265aebaa7fa906fcfa4e6.zip
[SSUS] Delete dnbd3's old "is-enabled" script
-rw-r--r--satellit_upgrader/updater.template.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index ea302e4..adb70ac 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -173,7 +173,6 @@ declare -rg PATH_TFTP="/srv/openslx/tftp"
declare -rg PATH_IPXE="/opt/openslx/ipxe"
declare -rg PATH_LDADP="/opt/ldadp"
declare -rg PATH_DNBD3="/opt/openslx/dnbd3"
-declare -rg PACKAGE_LIBJANSSON="libjansson-dev" # needed by dnbd3
if [ "$MAJOR" -eq 8 ]; then
echo "* * * * * * * * * * * * * * * * * * *"
@@ -608,7 +607,7 @@ fi
# config
diffcp "dnbd3/server.conf" "/etc/dnbd3-server/server.conf"
diffcp "dnbd3/rpc.acl" "/etc/dnbd3-server/rpc.acl"
-diffcp "dnbd3/is-enabled" "$PATH_DNBD3/is-enabled"
+rm -f -- "$PATH_DNBD3/is-enabled"
if [ -n "$TGZ_DNBD3" ]; then
tmpdir="$TMPDIR/dnbd3.tmp"