diff options
| author | Simon Rettberg | 2021-03-22 14:55:13 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2021-03-22 14:55:13 +0100 |
| commit | cae49c87abcca6898f500efef0211e2ee3a34500 (patch) | |
| tree | 67824d027efbfb074f251362761b399d25b263a6 /satellit_upgrader | |
| parent | [SS?S] php-mysqlnd was renamed to php-mysql a while ago (diff) | |
| download | setup-scripts-cae49c87abcca6898f500efef0211e2ee3a34500.tar.gz setup-scripts-cae49c87abcca6898f500efef0211e2ee3a34500.tar.xz setup-scripts-cae49c87abcca6898f500efef0211e2ee3a34500.zip | |
[SSUS] Fix: slx-admin restore.d doesn't get deployed
Diffstat (limited to 'satellit_upgrader')
| -rw-r--r-- | satellit_upgrader/updater.template.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh index af108a5..483da0f 100644 --- a/satellit_upgrader/updater.template.sh +++ b/satellit_upgrader/updater.template.sh @@ -110,6 +110,7 @@ diffcp () { else echo "Installing $2" fi + mkdir -p "$( dirname "$DST" )" cp -d "$SRC" "$DST" 2> /dev/null || cp -d -f "$SRC" "$DST" || perror "Could not copy '$1/$2' to '$DST'" return 0 } @@ -521,11 +522,10 @@ if [ -n "$TGZ_SLXADMIN" ]; then ln -s "${PATH_SLXADMINCACHE}/baseconfig-bwidm_settings.json" /srv/openslx/www/slx-admin/modules-available/baseconfig_bwidm/baseconfig/settings.json || \ pwarning "Could not set link ${PATH_SLXADMINCACHE}/baseconfig-bwidm_settings.json to /srv/openslx/www/slx-admin/modules-available/baseconfig_bwidm/baseconfig/settings.json - do so manually if you need bwIDM login on client computers" # update init script - if [ -d "${FILEDIR}/slxadmin-init" ]; then - rm -rf -- /opt/openslx/restore.d/slxadmin-init - mkdir -p /opt/openslx/restore.d || perror "Could not create /opt/openslx/restore.d" - cp -a "${FILEDIR}/slxadmin-init" /opt/openslx/restore.d/ - fi + rm -rf -- /opt/openslx/restore.d/slxadmin-init + diffcp "slxadmin" "/opt/openslx/restore.d/slxadmin-init/gpg-key.asc" + diffcp "slxadmin" "/opt/openslx/restore.d/slxadmin-init/slxadmin-init.php" + diffcp "slxadmin" "/opt/openslx/restore.d/slxadmin-init/init.sh" echo "Web interface upgrade complete" fi |