timoxa0/makelni
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

build_fn: fix image path

Browse source
This commit is contained in:
timoxa0 2024-11-02 21:51:44 +05:00
parent bb8a5520ad
commit 1799df1479
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
common.d/build_functions.sh
View file

@ -26,7 +26,7 @@ setup_inet()
create_image() create_image()
{ {
name="$(get_image_path "$1")" local name="$(get_image_path "$1")"
if [ -z "$2" ]; then if [ -z "$2" ]; then
size="$DEFAULT_IMAGE_SIZE" size="$DEFAULT_IMAGE_SIZE"
else else
@ -41,13 +41,16 @@ create_image()
log "Failed to cretae image [$name]" ierror log "Failed to cretae image [$name]" ierror
return 1 return 1
} }
mkfs.ext4 "$name" log "Creating ext4 fs on $name" internal
mkfs.ext4 "$name" || {
log "Failed to create new fs" ierror
}
} }
trim_image() trim_image()
{ {
{ {
name="$1" local name="$(get_image_path "$1")"
e2fsck -f "$name" e2fsck -f "$name"
resize2fs -M "$name" resize2fs -M "$name"
} || { } || {
@ -62,8 +65,10 @@ mount_image()
{ {
local mountdir="$(mktemp --tmpdir=./tmp/ -d)" local mountdir="$(mktemp --tmpdir=./tmp/ -d)"
local mountdir="$(realpath "$mountdir")" local mountdir="$(realpath "$mountdir")"
local name="$(get_image_path "$1")"
mount -o loop "$1" "$mountdir" || { mount -o loop "$name" "$mountdir" || {
log "Failed to mount image" ierror log "Failed to mount image" ierror
return 1 return 1
} }