Skip to content

fix: trying to fix backup differences #1740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Tbaile wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: trying to fix backup differences #1740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions packages/ns-plug/files/send-backup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ set -e

WORK_DIR="/var/backup"
BACKUP="$WORK_DIR/backup-$(date +%s).tar.gz"
EXTRACTED_BACKUP="$WORK_DIR/extracted"
MD5="$WORK_DIR/md5"
MD5_LAST="/etc/backup.md5"
PASSPHRASE="/etc/backup.pass"
Expand Down Expand Up @@ -44,8 +45,11 @@ if [ -f /etc/acme/http.header ]; then
fi

# Create the backup
mkdir -p $WORK_DIR
sysupgrade -k -b $BACKUP 2>/dev/null
mkdir -p "$WORK_DIR"
sysupgrade -k -b "$BACKUP" 2>/dev/null
mkdir -p "$EXTRACTED_BACKUP"
tar -xvf "$BACKUP" -C "$EXTRACTED_BACKUP"

@gsanchietti gsanchietti Jun 23, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suppress verbose output and gunzip:

Suggested change
tar -xvf "$BACKUP" -C "$EXTRACTED_BACKUP"
tar -xzf "$BACKUP" -C "$EXTRACTED_BACKUP" 2>/dev/null

Otherwise this is the raised error:

root@fw:~# sh -x /usr/sbin/send-backup 
+ set -e
+ WORK_DIR=/var/backup
+ date '+%s'
+ BACKUP=/var/backup/backup-1782227752.tar.gz
+ EXTRACTED_BACKUP=/var/backup/extracted
+ MD5=/var/backup/md5
+ MD5_LAST=/etc/backup.md5
+ PASSPHRASE=/etc/backup.pass
+ uci -q get ns-plug.config.system_id
+ SYSTEM_ID=F4B4E624-76A4-4A1C-991A-EEDA77EFFA85
+ uci -q get ns-plug.config.secret
+ SYSTEM_SECRET=dbc658783138b0e8fb30603f2d0fe5ab2aff5572c933651656e569b4c451018f
+ '[' -z F4B4E624-76A4-4A1C-991A-EEDA77EFFA85 ]
+ '[' -z dbc658783138b0e8fb30603f2d0fe5ab2aff5572c933651656e569b4c451018f ]
+ '[' -f /etc/acme/http.header ]
+ mkdir -p /var/backup
+ sysupgrade -k -b /var/backup/backup-1782227752.tar.gz
+ mkdir -p /var/backup/extracted
+ tar -xvf /var/backup/backup-1782227752.tar.gz -C /var/backup/extracted
tar: invalid tar magic

find "$EXTRACTED_BACKUP" -type f -exec md5sum {} \; > "$MD5"
md5sum $BACKUP | awk '{print $1}' > $MD5

# hack: restore acme working file
Expand All @@ -59,6 +63,6 @@ if [ ! -f "$MD5_LAST" ]; then
fi

# Send backup if the md5 is changed
if [ -f "$MD5_LAST" ] && [ "$(cat $MD5_LAST)" != "$(cat $MD5)" ]; then
if [ -f "$MD5_LAST" ] && ! md5sum -c -s "$MD5_LAST"; then
send
fi
Loading