From 95fa0c1b5dad5913e90e0a26f61292f7bbe91af6 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 30 Nov 2023 14:46:37 +0100 Subject: [PATCH] Test new data location https://github.com/alexbelgium/hassio-addons/issues/1063 --- omada/rootfs/etc/cont-init.d/00-run.sh | 45 +++++++------------------- 1 file changed, 12 insertions(+), 33 deletions(-) diff --git a/omada/rootfs/etc/cont-init.d/00-run.sh b/omada/rootfs/etc/cont-init.d/00-run.sh index 842cd8a71..8743c96b8 100755 --- a/omada/rootfs/etc/cont-init.d/00-run.sh +++ b/omada/rootfs/etc/cont-init.d/00-run.sh @@ -2,7 +2,7 @@ # shellcheck shell=bash set -e -CONFIGSOURCE="/data" +CONFIGSOURCE="/config" # Use ssl if [ -d /ssl ]; then @@ -11,44 +11,23 @@ if [ -d /ssl ]; then chown -R 508:508 /cert fi -# Create directory -if [ ! -f "$CONFIGSOURCE" ]; then - echo "Creating directory" - mkdir -p "$CONFIGSOURCE" -fi +# Migrate previous files +mkdir -p /config/data +mv /data/* /config/data -# Ensure structure is correct -cp -rnf /opt/tplink/EAPController/data/* "$CONFIGSOURCE" - -echo "Creating symlink" -# Clean existing folder -rm -r /opt/tplink/EAPController/data/* - -# Create symlinks for all files in /data -# shellcheck disable=SC2086 -for folders in html keystore pdf db omada/html portal; do - # Create new folder - mkdir -p /data/"$folders" - # Remove previous one - if [ -d /opt/tplink/EAPController/data/"$folders" ]; then - cp -rnf /opt/tplink/EAPController/data/"$folders"/* /data/"$folders"/* 2>/dev/null || true - rm -r /opt/tplink/EAPController/data/"$folders" - fi - # Create symlink - ln -s /data/"$folders" /opt/tplink/EAPController/data || true -done - -touch /data/LAST_RAN_OMADA_VER.txt -if [ -f /opt/tplink/EAPController/data/LAST_RAN_OMADA_VER.txt ]; then rm /opt/tplink/EAPController/data/LAST_RAN_OMADA_VER.txt; fi -ln -s /data/LAST_RAN_OMADA_VER.txt /opt/tplink/EAPController/data/ +# Copy app files +cp -rnf /opt/tplink/EAPController/data/* /config/data/ 2>/dev/null || true +rm -r /opt/tplink/EAPController/data 2>/dev/null || true +rm -r /opt/tplink/EAPController/logs 2>/dev/null || true +mv /opt/tplink/EAPController/* /config # Make sure permissions are right echo "Updating permissions" -chmod -R 777 "$CONFIGSOURCE" -chown -R "508:508" "$CONFIGSOURCE" +chmod -R 777 /config +chown -R "508:508" /config echo "" echo "" -echo "Recommendation : please backup your database and migrated to this addon https://github.com/jkunczik/home-assistant-omada" +echo "Recommendation : please backup your database and migrate to this addon https://github.com/jkunczik/home-assistant-omada" echo "" echo ""