diff --git a/src/freedombone-installer b/src/freedombone-installer index 4de172f7e1d741fa370d5ed74e49da742cd44204..accb359425de24a6eb6b602710cad205bf94e025 100755 --- a/src/freedombone-installer +++ b/src/freedombone-installer @@ -1005,10 +1005,10 @@ function backup_and_restore { rm "$format_file" check_backup_restore_processes $format_script - { echo "if /usr/local/bin/${PROJECT_NAME}-format simple; then"; + { echo "if /usr/local/bin/${PROJECT_NAME}-format simple > $webadmin_install_dir/format.txt; then"; echo " cp $webadmin_install_dir/format_complete.html $webadmin_install_dir/format_progress.html"; echo 'else'; - echo " cp $webadmin_install_dir/backup.html $webadmin_install_dir/format_progress.html"; + echo " cp $webadmin_install_dir/format_failed.html $webadmin_install_dir/format_progress.html"; echo 'fi'; echo "chown www-data:www-data $webadmin_install_dir/format_progress.html"; echo ''; diff --git a/webadmin/EN/format_failed.html b/webadmin/EN/format_failed.html new file mode 100644 index 0000000000000000000000000000000000000000..5c0c1e9ab07b897c8413f5d38126bc0918036b82 --- /dev/null +++ b/webadmin/EN/format_failed.html @@ -0,0 +1,74 @@ +<!DOCTYPE html> +<html> + <head> + <style> + #headerpic { + width: 60%; + height: auto; + margin-right : auto; + margin-left : auto; + min-width : 220px; + } + + .header { + text-align: center; + padding: 32px; + } + + #iconpic { + width: 20%; + height: auto; + margin-right : auto; + margin-left : auto; + min-width : 120px; + } + + .appurl { + color: grey; + font-size: 100%; + } + + .appdesc { + color: black; + font-size: 65%; + } + + button { + border: none; + outline: 0; + display: inline-block; + padding: 8px; + color: white; + background-color: #000; + text-align: center; + cursor: pointer; + width: 100%; + font-size: 18px; + } + + a { + text-decoration: none; + color: black; + } + + button:hover, a:hover { + opacity: 0.7; + } + + </style> + </head> + <body> + <div class="header"> + <a href="backup.html"><img id="headerpic" class="img-responsive" src="images/logo.png"></a> + + <h3>USB drive format has failed</h3> + + <h4>See <a href="format.txt">diagnostics</a></h4> + + <form action="backup.html"> + <input type="submit" value="Go Back" /> + </form> + </div> + + </body> +</html>