Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Double reserve disk to 2%; act on admin_console_install and _enabled #151

Merged
merged 2 commits into from
Oct 3, 2020
Merged

Double reserve disk to 2%; act on admin_console_install and _enabled #151

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f557216
Merge pull request #25 from iiab/master
holta Oct 3, 2020
4ef5fa1
Reserve disk space 1 -> 2%; act on admin_console_install|enabled
holta Oct 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions iiab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,11 @@ read ans < /dev/tty

######################### INTERACTIVE STUFF IS ABOVE #########################

# G. If RPi, lower reserve disk space from ~5% to 1%
# G. If RPi, lower reserve disk space from ~5% to 2%
#if [ -f /proc/device-tree/model ] && grep -qi raspberry /proc/device-tree/model; then
if [ -e /dev/mmcblk0p2 ]; then
echo -e "\n\nFound microSD card /dev/mmcblk0p2: Lower its reserve disk space from ~5% to 1%\n"
tune2fs -m 1 /dev/mmcblk0p2
echo -e "\n\nFound microSD card /dev/mmcblk0p2: Lower its reserve disk space from ~5% to 2%\n"
tune2fs -m 2 /dev/mmcblk0p2
fi

# H. Clone 3 IIAB repos
Expand Down Expand Up @@ -230,14 +230,33 @@ echo -e "└──────────────────────
cd $BASEDIR/iiab/
./iiab-install $@

echo -e "Install Admin Console... (also runs iiab-get-kiwix-cat to d/l Kiwix catalog, and installs Dynamic Menuing for /library/www/html/home/index.html)\n"
if [ ! -f $FLAGDIR/iiab-admin-console-complete ]; then
if [ -f $FLAGDIR/iiab-admin-console-complete ]; then
echo -e "ADMIN CONSOLE INSTALLATION IS ALREADY COMPLETE -- per existence of:"
echo -e "$FLAGDIR/iiab-admin-console-complete\n"
elif grep -q '^admin_console_install: False' /etc/iiab/local_vars.yml ; then
echo -e "LET'S NOT TRY TO INSTALL ADMIN CONSOLE -- because:"
echo -e "'admin_console_install: False' is in /etc/iiab/local_vars.yml\n"
else
echo -e "Install Admin Console... (also runs iiab-get-kiwix-cat to d/l Kiwix catalog,"
echo -e "and installs Dynamic Menuing for /library/www/html/home/index.html)\n"

cd $BASEDIR/iiab-admin-console
./install
touch $FLAGDIR/iiab-admin-console-complete
fi

if grep -q '^admin_console_enabled: False' /etc/iiab/local_vars.yml ; then
echo -e "'admin_console_enabled: False' is in /etc/iiab/local_vars.yml"
echo -e "...so let's try to DISABLE & STOP Admin Console's iiab-cmdsrv.service\n"

systemctl disable iiab-cmdsrv || true # Overrides 'set -e'
systemctl stop iiab-cmdsrv || true # Overrides 'set -e'
else
echo -e "ADMIN CONSOLE INSTALLATION IS ALREADY COMPLETE -- per existence of:"
echo -e "$FLAGDIR/iiab-admin-console-complete\n"
echo -e "'admin_console_enabled: False' isn't in /etc/iiab/local_vars.yml"
echo -e "...so let's try to ENABLE & START Admin Console's iiab-cmdsrv.service\n"

systemctl enable iiab-cmdsrv || true # Overrides 'set -e'
systemctl start iiab-cmdsrv || true # Overrides 'set -e'
fi

# J. KA Lite prep
Expand Down