Merge branch 'timesave_fix' into development

MaStr · MaStr · commit 03f0865fa49a · 2013-08-16T11:38:05.000+02:00
diff --git a/piratebox_origin/piratebox/piratebox/bin/install_piratebox.sh b/piratebox_origin/piratebox/piratebox/bin/install_piratebox.sh
@@ -153,23 +153,14 @@ fi
 
 set_Hostname() {
 	local name=$1 ; shift;
-        echo "
-	<html>
-	<head><title>Redirect...</title>
-	<meta http-equiv='refresh' content='0;url=http://$1/' />
-	<meta http-equiv='cache-control' content='no-cache'>
-	</head>
-	<body>
-	Redirect
-	</body>
-	</html>"  > $WWW_FOLDER/redirect.html
 
+	sed  "s|#####HOST#####|$name|g"  $PIRATEBOX_FOLDER/src/redirect.html.schema >  $WWW_FOLDER/redirect.html
         sed "s|HOST=\"$HOST\"|HOST=\"$name\"|" -i  $PIRATEBOX_CONFIG
 }
 
 if [ $2 = "hostname" ] ; then
 	echo "Switching hostname to $3"
 	set_hostname "$3"
 	echo "..done"
-fi	
+fi
 
diff --git a/piratebox_origin/piratebox/piratebox/bin/timesave.sh b/piratebox_origin/piratebox/piratebox/bin/timesave.sh
@@ -27,7 +27,6 @@ fi
 
 . $1
 
-TIMESAVE="$PIRATEBOX_FOLDER/timesave_file"
 
 if [ "$2" = "install" ] ; then
     crontab -l   >  $PIRATEBOX_FOLDER/tmp/crontab 2> /dev/null
@@ -38,19 +37,10 @@ if [ "$2" = "install" ] ; then
     touch $TIMESAVE
     chmod a+rw $TIMESAVE
 
-    if [  "$OPENWRT" = "yes" ] ; then
-        echo "Placing Timerecover on Startup" 
-        echo " $0 $1 recover " >> /etc/rc.local 
-	sed  's:exit:#exit:g' -i /etc/rc.local 
-        echo "Activating cron-service.."
-	/etc/init.d/cron enable
-	/etc/init.d/cron start
-	echo "done"
-    else 
-       echo "Remember to have cron active..."
-       echo "  on OpenWrt run:  /etc/init.d/cron enable"
-       echo "                   /etc/init.d/cron start"
-    fi
+    echo "Remember to have cron active..."
+    echo "  on OpenWrt run:  /etc/init.d/cron enable"
+    echo "                   /etc/init.d/cron start"
+
     #Save the current time
     $0 $1 "save"
     exit 0
@@ -70,9 +60,14 @@ if [ "$2" = "save" ] ; then
 fi
 
 if [ "$2" = "recover" ] ; then
-    date  `cat $TIMESAVE `
-    [ "$?" != "0" ] &&  echo "error in recovering time" && exit 255
-    echo "Time recovered"
-    exit 0
+    if [ `date +%C%g%m%d%H%M` -lt  `cat $TIMESAVE` ] ;
+	    date  `cat $TIMESAVE `
+	    [ "$?" != "0" ] &&  echo "error in recovering time" && exit 255
+	    echo "Time recovered"
+	    exit 0
+    else
+	   echo "Sorry, changing timebackward via timesave is not possible"
+	   exit 1
+    fi
 fi
 
diff --git a/piratebox_origin/piratebox/piratebox/conf/piratebox.conf b/piratebox_origin/piratebox/piratebox/conf/piratebox.conf
@@ -7,6 +7,7 @@
 ##  2012-06-08 Changed IP Stuff to generating dnsmasq.conf stuff
 ##             ADDed SubConfig for IPV6 config
 ##             Changed Order of config
+##  2013-08-14 Added timesave url
 ##  
 ########
 
@@ -110,6 +111,8 @@ IP=$NET.$IP_SHORT
 #----------------- Configuration for the pure piratebox -------------------#
 ## droopy, webserver, shoutbox- and forum-server 
 
+## Timesave file for non RTC devices
+TIMESAVE="$PIRATEBOX_FOLDER/share/timesave_file"
 
 #Start droopy? - Enable upload?
 DROOPY_ENABLED="yes"
diff --git a/piratebox_origin/piratebox/piratebox/src/redirect.html.schema b/piratebox_origin/piratebox/piratebox/src/redirect.html.schema
@@ -0,0 +1,11 @@
+	<html>
+	<head><title>Redirect...</title>
+	<meta http-equiv='refresh' content='0;url=http://#####HOST#####/' />
+	<meta http-equiv='cache-control' content='no-cache'>
+	</head>
+	<body>
+	Redirect
+	</body>
+	</html>
+
+
