Skip to content
Snippets Groups Projects
Commit 51a6092d authored by Bob Mottram's avatar Bob Mottram
Browse files

Install log is accessible from webadmin

parent add62686
No related branches found
No related tags found
No related merge requests found
......@@ -131,11 +131,20 @@ function run_setup_command {
echo ' touch /root/.running_install_command';
echo 'fi';
echo '';
echo "if [ -f $webadmin_install_dir/log.txt ]; then";
echo " rm $webadmin_install_dir/log.txt";
echo 'fi';
echo '';
echo "if ! /usr/local/bin/freedombone -c \"$CONFIGURATION_FILE\" > /root/.install_progress; then";
echo ' rm /root/.running_install_command';
echo " cp /root/.install_progress $webadmin_install_dir/log.txt";
echo " chown www-data:www-data $webadmin_install_dir/log.txt";
echo ' exit 364873';
echo 'fi';
echo '';
echo "cp /root/.install_progress $webadmin_install_dir/log.txt";
echo "chown www-data:www-data $webadmin_install_dir/log.txt";
echo '';
echo 'if [ -f /root/.running_install_command ]; then';
echo ' rm /root/.running_install_command';
echo 'fi';
......@@ -223,6 +232,9 @@ function after_setup_has_finished {
remove_temporary_setup_files
restore_webadmin_files
systemctl restart nginx
if [ -f /root/.finished_install_command ]; then
systemctl reboot -i
fi
}
function install_apps_from_webadmin {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment