ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-08 03:50:48 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

base-files: add sysupgrade -u to skip unchanged files

Browse Source 
With '-u', for a file /aaa/bbb/ccc enlisted for backup,
it will only get into backup if /rom/aaa/bbb/ccc does not
exist or /aaa/bbb/ccc is different from /rom/aaa/bbb/ccc.

It also works with '-c', but only effective for files touched
but not modified.

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
This commit is contained in:
Luiz Angelo Daros de Luca 2018-08-17 20:49:51 -03:00 committed by Kevin Darbyshire-Bryant
parent e8711daede
commit 20b23270b7
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
package/base-files/files/sbin/sysupgrade
View File

@ -10,6 +10,7 @@ export VERBOSE=1
export SAVE_CONFIG=1 export SAVE_CONFIG=1
export SAVE_OVERLAY=0 export SAVE_OVERLAY=0
export SAVE_PARTITIONS=1 export SAVE_PARTITIONS=1
export SKIP_UNCHANGED=0
export CONF_IMAGE= export CONF_IMAGE=
export CONF_BACKUP_LIST=0 export CONF_BACKUP_LIST=0
export CONF_BACKUP= export CONF_BACKUP=
@ -28,6 +29,7 @@ while [ -n "$1" ]; do
-n) export SAVE_CONFIG=0;; -n) export SAVE_CONFIG=0;;
-c) export SAVE_OVERLAY=1;; -c) export SAVE_OVERLAY=1;;
-p) export SAVE_PARTITIONS=0;; -p) export SAVE_PARTITIONS=0;;
-u) export SKIP_UNCHANGED=1;;
-b|--create-backup) export CONF_BACKUP="$2" NEED_IMAGE=1; shift;; -b|--create-backup) export CONF_BACKUP="$2" NEED_IMAGE=1; shift;;
-r|--restore-backup) export CONF_RESTORE="$2" NEED_IMAGE=1; shift;; -r|--restore-backup) export CONF_RESTORE="$2" NEED_IMAGE=1; shift;;
-l|--list-backup) export CONF_BACKUP_LIST=1;; -l|--list-backup) export CONF_BACKUP_LIST=1;;
@ -52,12 +54,13 @@ IMAGE="$1"
[ -z "$IMAGE" -a -z "$NEED_IMAGE" -a $CONF_BACKUP_LIST -eq 0 -o $HELP -gt 0 ] && { [ -z "$IMAGE" -a -z "$NEED_IMAGE" -a $CONF_BACKUP_LIST -eq 0 -o $HELP -gt 0 ] && {
cat <<EOF cat <<EOF
Usage: $0 [<upgrade-option>...] <image file or URL> Usage: $0 [<upgrade-option>...] <image file or URL>
$0 [-q] [-i] [-c] <backup-command> <file> $0 [-q] [-i] [-c] [-u] <backup-command> <file>
upgrade-option: upgrade-option:
-f <config> restore configuration from .tar.gz (file or url) -f <config> restore configuration from .tar.gz (file or url)
-i interactive mode -i interactive mode
-c attempt to preserve all changed files in /etc/ -c attempt to preserve all changed files in /etc/
-u skip from backup files that are equal to those in /rom
-n do not save configuration over reflash -n do not save configuration over reflash
-p do not attempt to restore the partition table after flash. -p do not attempt to restore the partition table after flash.
-T | --test -T | --test
@ -119,20 +122,19 @@ add_conffiles() {
local file="$1" local file="$1"
( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \ ( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \
/etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \ /etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \
-type f -o -type l 2>/dev/null; \( -type f -o -type l \) $find_filter 2>/dev/null;
list_changed_conffiles ) | sort -u > "$file" list_changed_conffiles ) | sort -u > "$file"
return 0 return 0
} }
add_overlayfiles() { add_overlayfiles() {
local file="$1" local file="$1"
find /overlay/upper/etc/ -type f -o -type l | sed \ ( cd /overlay/upper/; find ./etc \( -type f -o -type l \) $find_filter | sed \
-e 's,^/overlay\/upper/,/,' \ -e 's,^\.,,' \
-e '\,/META_[a-zA-Z0-9]*$,d' \ -e '\,^/etc/board.json$,d' \
-e '\,/functions.sh$,d' \
-e '\,/[^/]*-opkg$,d' \ -e '\,/[^/]*-opkg$,d' \
-e '\,/etc/urandom.seed$,d' \ -e '\,^/etc/urandom.seed$,d' \
> "$file" )> "$file"
return 0 return 0
} }
@ -149,6 +151,15 @@ else
sysupgrade_init_conffiles="add_conffiles" sysupgrade_init_conffiles="add_conffiles"
fi fi
find_filter=""
if [ $SKIP_UNCHANGED = 1 ]; then
[ ! -d /rom/ ] && {
echo "'/rom/' is required by '-u'"
exit 1
}
find_filter='( ( -exec test -e /rom/{} ; -exec cmp -s /{} /rom/{} ; ) -o -print )'
fi
include /lib/upgrade include /lib/upgrade
do_save_conffiles() { do_save_conffiles() {