To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit 19084867 authored by Reto Da Forno's avatar Reto Da Forno

minor changes

parent 24ff3940
...@@ -527,25 +527,30 @@ if [ ! "$2" = "-sdsetuponly" ]; then ...@@ -527,25 +527,30 @@ if [ ! "$2" = "-sdsetuponly" ]; then
scp $VARIOUSPATH/stm32loader/stm32loader.py root@$GUMSTIX:/usr/lib/python2.6/ scp $VARIOUSPATH/stm32loader/stm32loader.py root@$GUMSTIX:/usr/lib/python2.6/
fi fi
if [ ! "$2" = "-sdsetuponly" ]; then
scp $VARIOUSPATH/remount_rootfs_rw.sh root@$GUMSTIX:/usr/bin/
ssh root@$GUMSTIX "chmod +x /usr/bin/remount_rootfs_rw.sh"
fi
######################################################## ########################################################
# #
# Test target slots # Test target slots
# #
######################################################## ########################################################
if [ ! "$2" = "-sdsetuponly" ]; then #if [ ! "$2" = "-sdsetuponly" ]; then
if [ ! "$2" = "-notest" ]; then # if [ ! "$2" = "-notest" ]; then
echo "Upload testscript for target slots..."; # echo "Upload testscript for target slots...";
scp ../testing/observer/FlockBoard_rev1.1_testing/Testboard/flockboard_testslots.py root@$GUMSTIX:.; # scp ../testing/observer/FlockBoard_rev1.1_testing/Testboard/flockboard_testslots.py root@$GUMSTIX:.;
echo "Running testscript for target slots..."; # echo "Running testscript for target slots...";
ssh root@$GUMSTIX "./flockboard_testslots.py"; # ssh root@$GUMSTIX "./flockboard_testslots.py";
if [ $? -ne 0 ]; then # if [ $? -ne 0 ]; then
echo "!!!! Errors occurred when testing the target slots. Correct them and manually run flockboard_testslots.py from the oberserver again. When finished, delete the script from the observer. !!!!"; # echo "!!!! Errors occurred when testing the target slots. Correct them and manually run flockboard_testslots.py from the oberserver again. When finished, delete the script from the observer. !!!!";
else # else
echo "No errors occurred when testing the target slots. Thus deleting testscript..."; # echo "No errors occurred when testing the target slots. Thus deleting testscript...";
ssh root@$GUMSTIX "rm flockboard_testslots.py"; # ssh root@$GUMSTIX "rm flockboard_testslots.py";
fi # fi
fi # fi
fi #fi
######################################################## ########################################################
...@@ -560,4 +565,10 @@ fi ...@@ -560,4 +565,10 @@ fi
echo "Setup finished."; echo "Setup finished.";
echo "********************************************"; echo "********************************************";
if [ ! "$2" = "-sdsetuponly" ]; then
echo "Rebooting observer...";
ssh root@$GUMSTIX "reboot"
fi
exit; exit;
...@@ -11,10 +11,16 @@ ...@@ -11,10 +11,16 @@
?> ?>
<?php <?php
require_once('include/libflocklab.php'); require_once('include/libflocklab.php');
session_start();
$first = ((isset($_REQUEST['first'])) && ($_REQUEST['first'] == "no")) ? false : true; $first = ((isset($_REQUEST['first'])) && ($_REQUEST['first'] == "no")) ? false : true;
$login_msg = "Login failed."; $login_msg = "Login failed.";
# if already logged in, then redirect to index.php
if (isset($_SESSION['logged_in']) && $_SESSION['logged_in']) {
header('Location: https://'.$_SERVER[HTTP_HOST].substr($_SERVER[REQUEST_URI], 0, strrpos($_SERVER[REQUEST_URI], "/") + 1)."index.php");
}
if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($_SERVER['REQUEST_METHOD'] == 'POST') {
session_start(); session_start();
$hostname = $_SERVER['HTTP_HOST']; $hostname = $_SERVER['HTTP_HOST'];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment