]> git.ipfire.org Git - people/mfischer/ipfire-2.x.git/commitdiff
backup: Abort when the backup could not be extracted
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 4 Mar 2022 10:18:25 +0000 (10:18 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 7 Mar 2022 18:51:14 +0000 (18:51 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/backup/backup.pl

index 63004491c9257edbb23798e0304fe0219dc8e1f8..768b3550886c0e433e1dcb417d8827b05063f222 100644 (file)
@@ -71,7 +71,11 @@ make_backup() {
 restore_backup() {
        local filename="${1}"
 
-       tar xvzpf "${filename}" -C /
+       # Extract backup
+       if ! tar xvzpf "${filename}" -C /; then
+               echo "Could not extract backup" >&2
+               return 1
+       fi
 
        # Restart syslogd, httpd and suricata in case we've just loaded old logs
        apachectl -k graceful
@@ -202,7 +206,11 @@ restore_addon_backup() {
                mv "/tmp/${name}.ipf" "/var/ipfire/backup/addons/backup/${name}.ipf"
        fi
 
-       tar xvzpf "/var/ipfire/backup/addons/backup/${name}.ipf" -C /
+       # Extract backup
+       if ! tar xvzpf "/var/ipfire/backup/addons/backup/${name}.ipf" -C /; then
+               echo "Could not extract backup" >&2
+               return 1
+       fi
 }
 
 main() {