From 853ddf1a1ace3afe865443bc4a4a3d180cbbf629 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 5 Aug 2020 14:17:58 -0400 Subject: [PATCH] Remove legacy code from iiab-install --- iiab-install | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/iiab-install b/iiab-install index 6eeac2db6..261893cf3 100755 --- a/iiab-install +++ b/iiab-install @@ -145,36 +145,7 @@ if [ "$STAGE" -lt 2 ] && [ "$1" == "--debug" ]; then echo -e "\n'--debug' *ignored* as STAGE (counter) < 2." fi -# TEMPORARY: Catch images up to current code to benefit from pre-installed apps -# Workaround for (web-published) images; will go away later -# Assumes /etc/iiab/iiab_state.yml is not created until (prior run of) Stage 4 but -# config_vars2.yml is present with the stage counter altered by pi-gen to be 2. -if [ -f /etc/iiab/config_vars2.yml ]; then - mv /etc/iiab/config_vars2.yml $IIAB_STATE_FILE - -# Fix up prior values in state file -# mongo role improved post image creation - if grep -q sugar $IIAB_STATE_FILE && ! grep -q mongodb $IIAB_STATE_FILE; then - echo "mongodb_installed: True" >> $IIAB_STATE_FILE - fi - -# TEMPORARY: another change to account for -# sed -i -e 's/pan_bluetooth/bluetooth/' $IIAB_STATE_FILE - - if [ "$STAGE" -eq 2 ]; then - echo -e "\nCompleting Stage 3 from IIAB image (starts systemd service iiab-setup-db to run the 'mysql' role)." - systemctl start iiab-setup-db - fi - - PLAYBOOK="iiab-from-console.yml" # Stage 4-9 then Network Role - ARGS="" # Removes '--extra-vars reinstall=True' if --reinstall, BUT WHY? -# The same as --reinstall except Stage 3 is not run as there are no other functional -# changes in Stage 3 to account for post image creation, once the above is run. -# reinstall=True would force kiwix to re-download and re-install in commit -# ce2ec3b0cad76449caf3299003b5d297a3164181 -## End image catch up -fi - +# /etc/iiab/iiab_state.yml is mandatory and must be created here. Background: # Allow iiab-install to read IIAB_STATE_FILE to not repeat installs of previous # roles that already completed within the stage. if [ ! -f $IIAB_STATE_FILE ]; then