From 45817867e93508001e56d12d67218d93069f541d Mon Sep 17 00:00:00 2001
From: Vinicius Ruoso <vkr07@c3sl.ufpr.br>
Date: Wed, 26 May 2010 18:52:07 -0300
Subject: [PATCH] Added support to update the agent even when inep or proxy
files are missing
The new necessity of install the system with an empty inep/proxy had to be
implemented in the update bootstrap. This patch allows the update process to
run properly on a missing inep/proxy system.
Acked-by: Danilo K. S. Yorinori <danilok@c3sl.ufpr.br>
Signed-off-by: Vinicius Ruoso <vkr07@c3sl.ufpr.br>
---
bootstraps/bootstrap-update | 39 +++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 17 deletions(-)
diff --git a/bootstraps/bootstrap-update b/bootstraps/bootstrap-update
index e5de335..2c97b9c 100644
--- a/bootstraps/bootstrap-update
+++ b/bootstraps/bootstrap-update
@@ -88,28 +88,33 @@ cd - &>/dev/null
mkdir -p "${SEED_MEC_HOME}/update/tmp/SEED2-run/client/conf"
# Check if inep and proxy files exist
+ERROR=0
INEP_PROXY="${SEED_MEC_HOME}/SEED2/client/conf/inep
${SEED_MEC_HOME}/SEED2/client/conf/proxy"
for FILE in ${INEP_PROXY}; do
- test -f "${FILE}" ||
- abort "inep and/or proxy file(s) missing, please reinstall the package."
+ test -f "${FILE}" || ERROR=1
done
-# Copy inep and proxy to new tree
-cp -a "${SEED_MEC_HOME}/SEED2/client/conf/"{inep,proxy} \
- "${SEED_MEC_HOME}/update/tmp/SEED2-run/client/conf/"
-
-# Copy or create the md5 files from inep and proxy
-(test -d "${SEED_MEC_HOME}/SEED2/.md5sum" &&
- cp -a "${SEED_MEC_HOME}/SEED2/.md5sum/client/conf/"{inep,proxy} \
- "${SEED_MEC_HOME}/update/tmp/SEED2-run/.md5sum/client/conf/") ||
-restore_inep_proxy_md5sum
-
-# Copy or create the backup files from inep and proxy
-(test -d "${SEED_MEC_HOME}/SEED2/.backup" &&
- cp -a "${SEED_MEC_HOME}/SEED2/.backup/client/conf/"{inep,proxy} \
- "${SEED_MEC_HOME}/update/tmp/SEED2-run/.backup/client/conf/") ||
-restore_inep_proxy_backup
+# Do nothing if there's no inep or proxy conf files
+if test "${ERROR}" -eq 0; then
+
+ # Copy inep and proxy to new tree
+ cp -a "${SEED_MEC_HOME}/SEED2/client/conf/"{inep,proxy} \
+ "${SEED_MEC_HOME}/update/tmp/SEED2-run/client/conf/"
+
+ # Copy or create the md5 files from inep and proxy
+ (test -d "${SEED_MEC_HOME}/SEED2/.md5sum" &&
+ cp -a "${SEED_MEC_HOME}/SEED2/.md5sum/client/conf/"{inep,proxy} \
+ "${SEED_MEC_HOME}/update/tmp/SEED2-run/.md5sum/client/conf/") ||
+ restore_inep_proxy_md5sum
+
+ # Copy or create the backup files from inep and proxy
+ (test -d "${SEED_MEC_HOME}/SEED2/.backup" &&
+ cp -a "${SEED_MEC_HOME}/SEED2/.backup/client/conf/"{inep,proxy} \
+ "${SEED_MEC_HOME}/update/tmp/SEED2-run/.backup/client/conf/") ||
+ restore_inep_proxy_backup
+
+fi
--
GitLab