Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso/mkarchiso
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2021-11-22 11:40:59 +0200
committernl6720 <nl6720@gmail.com>2021-11-22 12:04:35 +0200
commita7f879fcdd5986ad6047a4a59d61ef10b7d9f05e (patch)
treee20de0325ad5928300af84d2f02dd09f063d0d57 /archiso/mkarchiso
parent8cfe29043f0626e12e157cd3f2354a6baf3ba076 (diff)
mkarchiso: use mkfs.erofs --quiet in quiet mode
erofs-utils 1.4 introduced a --quiet option. Related to #148.
Diffstat (limited to 'archiso/mkarchiso')
-rwxr-xr-xarchiso/mkarchiso6
1 files changed, 4 insertions, 2 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 8332604..4d7b1bc 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -213,16 +213,18 @@ _mkairootfs_squashfs() {
# Create an EROFS image containing the root file system and saves it on the ISO 9660 file system.
_mkairootfs_erofs() {
- local fsuuid
+ local fsuuid mkfs_erofs_options=()
[[ -e "${pacstrap_dir}" ]] || _msg_error "The path '${pacstrap_dir}' does not exist" 1
install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.erofs"
rm -f -- "${image_path}"
+ [[ ! "${quiet}" == "y" ]] || mkfs_erofs_options+=('--quiet')
# Generate reproducible file system UUID from SOURCE_DATE_EPOCH
fsuuid="$(uuidgen --sha1 --namespace 93a870ff-8565-4cf3-a67b-f47299271a96 --name "${SOURCE_DATE_EPOCH}")"
+ mkfs_erofs_options+=('-U' "${fsuuid}" "${airootfs_image_tool_options[@]}")
_msg_info "Creating EROFS image, this may take some time..."
- mkfs.erofs -U "${fsuuid}" "${airootfs_image_tool_options[@]}" -- "${image_path}" "${pacstrap_dir}"
+ mkfs.erofs "${mkfs_erofs_options[@]}" -- "${image_path}" "${pacstrap_dir}"
_msg_info "Done!"
}