libdevuansdk

commit 25052a6a9a11137cd37306c8638a52d30024bc6c
parent 4e4f10ef42735c252d7ffc7fee7f3fb5b46863ed
Author: parazyd <parazyd@dyne.org>
Date:   Wed,  8 Jun 2016 18:33:33 +0200

img_ namespace fix

Diffstat:
M
doc/README-functions.md
 | 
8
++++----
M
zlibs/imaging
 | 
16
++++++++--------

2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/doc/README-functions.md b/doc/README-functions.md
@@ -28,16 +28,16 @@ Unpack the tarball of a base working system to the strapdir.
 ## img_mkimage() ##
 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)
 
-## img_partimage_gpt() ##
+## img_partition_gpt() ##
 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.
 
-## img_umountimage() ##
+## img_umount() ##
 Undoes the above function.
 
 # zlibs/helpers
diff --git a/zlibs/imaging b/zlibs/imaging
@@ -39,8 +39,8 @@ img_mkimage() {
 		bs=1M count=${imgsize}
 }
 
-img_partimage_dos() {
-	fn img_partimage_dos
+img_partition_dos() {
+	fn img_partition_dos
 	req=(imgname imgpath)
 	ckreq || return 1
 
@@ -62,8 +62,8 @@ img_partimage_dos() {
 	popd
 }
 
-img_partimage_gpt() {
-	fn img_partimage_gpt
+img_partition_gpt() {
+	fn img_partition_gpt
 	req=(imgname imgpath)
 	ckreq || return 1
 
@@ -88,8 +88,8 @@ img_partimage_gpt() {
 	popd
 }
 
-img_mountimage() {
-	fn img_mountimage
+img_mount() {
+	fn img_mount
 	req=(bootpart rootpart workdir)
 	ckreq || return 1
 
@@ -99,8 +99,8 @@ img_mountimage() {
 	escalate root "mount ${bootpart} ${workdir}/rootp/boot" && act "mounted root partition"
 }
 
-img_umountimage() {
-	fn img_umountimage
+img_umount() {
+	fn img_umount
 	req=(bootpart rootpart workdir)
 	ckreq || return 1