Backup funktioniert jetzt auch via Webinterface

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@768 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 67f53d0e0b39500c72b4106917da0148af55f96c..2f307f6493b88ee0f8daaaddd59bd2675a732a06 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -39,7 +39,7 @@ elsif ($ARGV[0] eq 'exclude') {
   system("rm /tmp/include");
 }
 elsif ($ARGV[0] eq 'restore') {
-  system("tar -xvz --preserve -f /tmp/restore.ipf");
+  system("cd / && tar -xvz --preserve -f /tmp/restore.ipf");
 }
 elsif ($ARGV[0] eq 'cli') {
   system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden:$Minuten-$ARGV[1].ipf --files-from='$ARGV[2]' --exclude-from='$ARGV[3]'");

diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
index fc770657145948d8cf6af9e2e4aacff148b45307..194a70e7ed0e01d4b8bb9a95a80981186dd5532e 100644 (file)
--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.cgi
@@ -58,7 +58,7 @@ elsif ( $cgiparams{'ACTION'} eq "restore" )
   print UPLOADFILE;
   }
   close UPLOADFILE;
-  system("/usr/local/bin/backupctrl restore");
+  system("/usr/local/bin/backupctrl restore >/dev/null");
 }
 
 &Header::showhttpheaders();