external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

iiab-install account for bluetooth change, expand notes

Browse source
This commit is contained in:
Jerry Vonau 2019-10-25 12:13:57 -05:00
parent 6f19471a5f
commit 2243cd6d9a
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
iiab-install
View file

@ -146,17 +146,21 @@ if [ "$STAGE" -lt 2 ] && [ "$1" == "--debug" ]; then
fi fi
# TEMPORARY: Catch images up to current code to benefit from pre-installed apps # 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 if [ -f /etc/iiab/config_vars2.yml ]; then
mv /etc/iiab/config_vars2.yml $IIAB_STATE_FILE mv /etc/iiab/config_vars2.yml $IIAB_STATE_FILE
fi
# Assumes /etc/iiab/iiab_state.yml is not created until (prior run of) Stage 4. # Fix up prior values in state file
if [ -f $IIAB_STATE_FILE ]; then # mongo role improved post image creation
# Workaround for (web-published) images; will go away later
if grep -q sugar $IIAB_STATE_FILE; && ! grep -q mongodb $IIAB_STATE_FILE; then if grep -q sugar $IIAB_STATE_FILE; && ! grep -q mongodb $IIAB_STATE_FILE; then
echo "mongodb_installed: True" >> $IIAB_STATE_FILE echo "mongodb_installed: True" >> $IIAB_STATE_FILE
fi fi
# another change to accout for
sed -i -e 's/pan_bluetooth/bluetooth/' $IIAB_STATE_FILE
if [ "$STAGE" -eq 2 ]; then if [ "$STAGE" -eq 2 ]; then
echo -e "\nCompleting Stage 3 from IIAB image (starts systemd service iiab-setup-db to run the 'mysql' role)." echo -e "\nCompleting Stage 3 from IIAB image (starts systemd service iiab-setup-db to run the 'mysql' role)."
systemctl start iiab-setup-db systemctl start iiab-setup-db
@ -164,6 +168,11 @@ if [ -f $IIAB_STATE_FILE ]; then
PLAYBOOK="iiab-from-console.yml" # Stage 4-9 then Network Role PLAYBOOK="iiab-from-console.yml" # Stage 4-9 then Network Role
ARGS="" # Removes '--extra-vars reinstall=True' if --reinstall, BUT WHY? ARGS="" # Removes '--extra-vars reinstall=True' if --reinstall, BUT WHY?
# the same as --reinstall execpt 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 fi
echo -e "\nTRY TO RERUN './iiab-install' IF IT FAILS DUE TO CONNECTIVITY ISSUES ETC!\n" echo -e "\nTRY TO RERUN './iiab-install' IF IT FAILS DUE TO CONNECTIVITY ISSUES ETC!\n"