Ticket #1124: ds-backup080109.sh.patch

ds-backup.sh

@@ -26 +26 @@
 function skip_noschoolnet {
 
     # no DNS, no XS
-    # grep -c '^nameserver ' /etc/resolv.conf 1>&/dev/null || exit
+    grep -c '^nameserver ' /etc/resolv.conf 1>&/dev/null || exit
 
-    # can't resolve & ping? outta here
-    # verify if we are inside an soas 
+    # verify if we got the backup_url from registration
 
-    if [ -e ~/.sugar/soas/backup_url ]
+    if [ -e ~/.sugar/default/identifiers/backup_url ]
     then
-      BACKUP_URL=`cat ~/.sugar/soas/backup_url`
+      BACKUP_URL=`cat ~/.sugar/default/identifiers/backup_url`
     else
       BACKUP_URL='schoolserver'
     fi
-    echo "PINGING BACKUP_URL"
+
+    # can't resolve & ping? outta here
+
     ping -c1 $BACKUP_URL 1>&/dev/null || exit
 
     # TODO: if we are on a mesh, count the hops to
@@ -116 +117 @@
 cd ~
 
 ## These checks are ordered cheapest first
-echo "CHECKING IFRECENT ";
 skip_ifrecent;
-echo "CHECKING LOWBAT ";
-skip_onlowbatt;
-echo "CHECKING SCHOOL NET ";
+## SoaS : do not check battery when we are on SoaS
+if [ ! -e ~/.sugar/default/identifiers/backup_url ]
+then
+  skip_onlowbatt;
+fi
 skip_noschoolnet;
-echo "DONE WITH CHECKS ";
 
 ### Ok, we are going to attempt a backup