devuan-sdk
/
libdevuansdk
mirror of https://github.com/parazyd/libdevuansdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

img_ namespace fix

This commit is contained in:
parazyd 2016-06-08 18:33:33 +02:00
parent 4e4f10ef42
commit 25052a6a9a
No known key found for this signature in database
GPG Key ID: F0CB28FCF78637DE
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/README-functions.md
View File

@ -28,16 +28,16 @@ Unpack the tarball of a base working system to the strapdir.
## img_mkimage() ## ## img_mkimage() ##
Uses dd to dump zeroes into a raw .img of the preconfigured size. Uses dd to dump zeroes into a raw .img of the preconfigured size.
## img_partimage_dos() ## ## img_partition_dos() ##
Partitions the raw image into dos format and formats (boot=ext2; root=ext4) Partitions the raw image into dos format and formats (boot=ext2; root=ext4)
## img_partimage_gpt() ## ## img_partition_gpt() ##
Partitions the raw image into gpt format and formats (boot=ext2; root=ext4) Partitions the raw image into gpt format and formats (boot=ext2; root=ext4)
## img_mountimage() ## ## img_mount() ##
Mounts the root and boot partitions in `$workdir/rootp` in order to work on it. Mounts the root and boot partitions in `$workdir/rootp` in order to work on it.
## img_umountimage() ## ## img_umount() ##
Undoes the above function. Undoes the above function.
# zlibs/helpers # zlibs/helpers

16
zlibs/imaging
View File

@ -39,8 +39,8 @@ img_mkimage() {
bs=1M count=${imgsize} bs=1M count=${imgsize}
} }
img_partimage_dos() { img_partition_dos() {
fn img_partimage_dos fn img_partition_dos
req=(imgname imgpath) req=(imgname imgpath)
ckreq || return 1 ckreq || return 1
@ -62,8 +62,8 @@ img_partimage_dos() {
popd popd
} }
img_partimage_gpt() { img_partition_gpt() {
fn img_partimage_gpt fn img_partition_gpt
req=(imgname imgpath) req=(imgname imgpath)
ckreq || return 1 ckreq || return 1
@ -88,8 +88,8 @@ img_partimage_gpt() {
popd popd
} }
img_mountimage() { img_mount() {
fn img_mountimage fn img_mount
req=(bootpart rootpart workdir) req=(bootpart rootpart workdir)
ckreq || return 1 ckreq || return 1
@ -99,8 +99,8 @@ img_mountimage() {
escalate root "mount ${bootpart} ${workdir}/rootp/boot" && act "mounted root partition" escalate root "mount ${bootpart} ${workdir}/rootp/boot" && act "mounted root partition"
} }
img_umountimage() { img_umount() {
fn img_umountimage fn img_umount
req=(bootpart rootpart workdir) req=(bootpart rootpart workdir)
ckreq || return 1 ckreq || return 1