Fix ckreq variables (zlibs/imaging)
Signed-off-by: gryrmln <gryrmln@localhost>
This commit is contained in:
parent
647e0f65c6
commit
7b9e09795f
|
|
@ -21,7 +21,7 @@ vars+=(bootpart rootpart loopdevice)
|
||||||
strapdir_to_image()
|
strapdir_to_image()
|
||||||
{
|
{
|
||||||
fn strapdir_to_image
|
fn strapdir_to_image
|
||||||
req=(workdir strapdir bootpart rootpart loopdevice)
|
req=(workdir strapdir)
|
||||||
ckreq || return 1
|
ckreq || return 1
|
||||||
|
|
||||||
notice "Copying strapdir to image ..."
|
notice "Copying strapdir to image ..."
|
||||||
|
|
@ -130,8 +130,6 @@ image_format_partitions()
|
||||||
image_connect_raw()
|
image_connect_raw()
|
||||||
{
|
{
|
||||||
fn image_connect_raw
|
fn image_connect_raw
|
||||||
req=(workdir image_name)
|
|
||||||
ckreq || return 1
|
|
||||||
|
|
||||||
notice "Connecting raw image to loop device"
|
notice "Connecting raw image to loop device"
|
||||||
|
|
||||||
|
|
@ -166,7 +164,7 @@ image_connect_qcow2()
|
||||||
image_partition_dos()
|
image_partition_dos()
|
||||||
{
|
{
|
||||||
fn image_partition_dos
|
fn image_partition_dos
|
||||||
req=(loopdevice bootpart rootpart dos_boot dos_root)
|
req=(loopdevice dos_boot dos_root)
|
||||||
ckreq || return 1
|
ckreq || return 1
|
||||||
|
|
||||||
notice "Partitioning dos image"
|
notice "Partitioning dos image"
|
||||||
|
|
@ -228,7 +226,7 @@ image_mount()
|
||||||
image_umount()
|
image_umount()
|
||||||
{
|
{
|
||||||
fn image_umount
|
fn image_umount
|
||||||
req=(workdir bootpart rootpart)
|
req=(workdir loopdevice)
|
||||||
ckreq || return 1
|
ckreq || return 1
|
||||||
|
|
||||||
notice "Umounting image from $workdir/mnt"
|
notice "Umounting image from $workdir/mnt"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue