diff options
| author | John Crispin <john@openwrt.org> | 2015-09-14 20:09:06 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-09-14 20:09:06 +0000 |
| commit | 4ef319fad23b566a226dc3edcf1f3e50c43032e2 (patch) | |
| tree | ad9b5ade8f6b7ae2482bd6f8dac2a367c53d4134 | |
| parent | 2efdc7c896fcd846e9a4732f93dc36e095d37a07 (diff) | |
| download | master-31e0f0ae-4ef319fad23b566a226dc3edcf1f3e50c43032e2.tar.gz master-31e0f0ae-4ef319fad23b566a226dc3edcf1f3e50c43032e2.tar.bz2 master-31e0f0ae-4ef319fad23b566a226dc3edcf1f3e50c43032e2.zip | |
base-files: sysupgrade: quote source image name
get_image() eval a filename without quoting it, resulting in errors with
filenames containing characters that need to be escaped.
$ sysupgrade -T -f ./cfg\(12\).tar.gz img.bin; echo $?
Image check 'platform_check_image' failed.
Invalid config file. Please use only .tar.gz files
1
$ mv cfg\(12\).tar.gz cfg_12.tar.gz
$ mv img\(1\).bin img.bin
sysupgrade -T -f ./cfg_12.tar.gz img.bin; echo $?
0
Enclose the content of $from in double quotes.
Signed-off-by: Adrien Schildknecht <adrien+dev@schischi.me>
SVN-Revision: 46919
| -rw-r--r-- | package/base-files/files/lib/upgrade/common.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 189ef69e95..761b4c1795 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -184,14 +184,14 @@ get_image() { # <source> [ <command> ] *) cmd="cat";; esac if [ -z "$conc" ]; then - local magic="$(eval $cmd $from 2>/dev/null | dd bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')" + local magic="$(eval $cmd \"$from\" 2>/dev/null | dd bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')" case "$magic" in 1f8b) conc="zcat";; 425a) conc="bzcat";; esac fi - eval "$cmd $from 2>/dev/null ${conc:+| $conc}" + eval "$cmd \"$from\" 2>/dev/null ${conc:+| $conc}" } get_magic_word() { |