kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

img-lib: fix unpack_img() 

- det_img should have been det_archive
- for ft=xz|gzip|bzip2, decompr should be "$ft -dc"
master
Will Woods 2012-03-08 18:02:29 -05:00 committed by Harald Hoyer
parent 2ff3fc73c8
commit 04febed782
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules.d/99img-lib/img-lib.sh
View File

@ -1,12 +1,13 @@
#!/bin/sh #!/bin/sh
# img-lib.sh: utilities for dealing with archives and filesystem images. # img-lib.sh: utilities for dealing with archives and filesystem images.
# #
# TODO: identify/unpack rpm, deb? # TODO: identify/unpack rpm, deb, maybe others?




# super-simple "file" that only identifies archives. # super-simple "file" that only identifies archives.
# works with stdin if $1 is not set. # works with stdin if $1 is not set.
det_archive() { det_archive() {
# NOTE: echo -e works in ash and bash, but not dash
local bz="BZh" xz="$(echo -e '\xfd7zXZ')" gz="$(echo -e '\x1f\x8b')" local bz="BZh" xz="$(echo -e '\xfd7zXZ')" gz="$(echo -e '\x1f\x8b')"
local headerblock="$(dd ${1:+if=$1} bs=262 count=1 2>/dev/null)" local headerblock="$(dd ${1:+if=$1} bs=262 count=1 2>/dev/null)"
case "$headerblock" in case "$headerblock" in
@ -32,7 +33,7 @@ unpack_archive() {
local img="$1" outdir="$2" archiver="" decompr="" local img="$1" outdir="$2" archiver="" decompr=""
local ft="$(det_archive $img)" local ft="$(det_archive $img)"
case "$ft" in case "$ft" in
xz|gzip|bzip2) decompr="$decompr -dc" ;; xz|gzip|bzip2) decompr="$ft -dc" ;;
cpio|tar) decompr="cat";; cpio|tar) decompr="cat";;
*) return 1 ;; *) return 1 ;;
esac esac
@ -64,7 +65,7 @@ unpack_img() {
[ -r "$img" ] || { warn "can't read img!"; return 1; } [ -r "$img" ] || { warn "can't read img!"; return 1; }
[ -n "$outdir" ] || { warn "unpack_img: no output dir given"; return 1; } [ -n "$outdir" ] || { warn "unpack_img: no output dir given"; return 1; }


if [ "$(det_img $img)" ]; then if [ "$(det_archive $img)" ]; then
unpack_archive "$@" || { warn "can't unpack archive file!"; return 1; } unpack_archive "$@" || { warn "can't unpack archive file!"; return 1; }
else else
unpack_fs "$@" || { warn "can't unpack filesystem image!"; return 1; } unpack_fs "$@" || { warn "can't unpack filesystem image!"; return 1; }