projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base-files: abort sysupgrade if file specified with --restore-config is not found
[openwrt.git]
/
package
/
base-files
/
files
/
sbin
/
sysupgrade
diff --git
a/package/base-files/files/sbin/sysupgrade
b/package/base-files/files/sbin/sysupgrade
index
49c34b8
..
f6b628e
100755
(executable)
--- a/
package/base-files/files/sbin/sysupgrade
+++ b/
package/base-files/files/sbin/sysupgrade
@@
-140,7
+140,12
@@
if [ -n "$CONF_BACKUP" ]; then
exit $?
fi
exit $?
fi
-if [ -f "$CONF_RESTORE" ] || [ "$CONF_RESTORE" = "-" ]; then
+if [ -n "$CONF_RESTORE" ]; then
+ if [ "$CONF_RESTORE" != "-" ] && [ ! -f "$CONF_RESTORE" ]; then
+ echo "Backup archive '$CONF_RESTORE' not found."
+ exit 1
+ fi
+
[ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
tar -C / -x${TAR_V}zf "$CONF_RESTORE"
exit $?
[ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
tar -C / -x${TAR_V}zf "$CONF_RESTORE"
exit $?