workaround img_mkimage

This commit is contained in:
parazyd 2016-06-15 18:42:28 +02:00
parent 76560688fd
commit 5f767dd9b5
No known key found for this signature in database
GPG Key ID: F0CB28FCF78637DE
1 changed files with 6 additions and 6 deletions

View File

@ -27,11 +27,11 @@ vars+=(imgname imgpath)
img_mkimage() { img_mkimage() {
fn img_mkimage $@ fn img_mkimage $@
imgpath=${1:-${strapdir}.img} imgpath=${strapdir}.img
local mbrtype="$2" local mbrtype="$1"
local bootfstype="$3" local bootfstype="$2"
local rootfstype="$4" local rootfstype="$3"
local imgsize=${5:-$imgsize} local imgsize="$4"
req=(imgpath imgsize mbrtype bootfstype rootfstype) req=(imgpath imgsize mbrtype bootfstype rootfstype)
ckreq || return 1 ckreq || return 1
@ -54,7 +54,7 @@ img_mkimage() {
img_mount img_mount
img_rsync_strapdir img_rsync_strapdir
[[ -z $override_bootloader ]] && img_install_bootloader # [[ -z $override_bootloader ]] && img_install_bootloader
img_umount img_umount
} }