@@ -245,16 +245,14 @@ _mkairootfs_squashfs() {
245245
246246# Create an EROFS image containing the root file system and saves it on the ISO 9660 file system.
247247_mkairootfs_erofs () {
248- local fsuuid mkfs_erofs_options=()
248+ local mkfs_erofs_options=()
249249 [[ -e " ${pacstrap_dir} " ]] || _msg_error " The path '${pacstrap_dir} ' does not exist" 1
250250
251251 install -d -m 0755 -- " ${isofs_dir} /${install_dir} /${arch} "
252252 local image_path=" ${isofs_dir} /${install_dir} /${arch} /airootfs.erofs"
253253 rm -f -- " ${image_path} "
254254 [[ ! " ${quiet} " == " y" ]] || mkfs_erofs_options+=(' --quiet' )
255- # Generate reproducible file system UUID from SOURCE_DATE_EPOCH
256- fsuuid=" $( uuidgen --sha1 --namespace 93a870ff-8565-4cf3-a67b-f47299271a96 --name " ${SOURCE_DATE_EPOCH} " ) "
257- mkfs_erofs_options+=(' -U' " ${fsuuid} " " ${airootfs_image_tool_options[@]} " )
255+ mkfs_erofs_options+=(' -U' ' 00000000-0000-0000-0000-000000000000' " ${airootfs_image_tool_options[@]} " )
258256 _msg_info " Creating EROFS image, this may take some time..."
259257 mkfs.erofs " ${mkfs_erofs_options[@]} " -- " ${image_path} " " ${pacstrap_dir} "
260258 _msg_info " Done!"
@@ -1411,7 +1409,7 @@ _validate_requirements_buildmode_bootstrap() {
14111409 # Check if the compressor is installed
14121410 if (( ${# bootstrap_tarball_compression[@]} )) ; then
14131411 case " ${bootstrap_tarball_compression[0]} " in
1414- ' bzip' |' gzip' |' lrzip' |' lzip' |' lzop' |' zstd' |' zstdmt' )
1412+ ' bzip' |' gzip' |' lrzip' |' lzip' |' lzop' |' xz ' | ' zstd' |' zstdmt' )
14151413 if ! command -v " ${bootstrap_tarball_compression[0]} " & > /dev/null; then
14161414 (( validation_error= validation_error+ 1 ))
14171415 _msg_error " Validating build mode '${_buildmode} ': '${bootstrap_tarball_compression[0]} ' is not available on this host. Install '${bootstrap_tarball_compression[0]/ zstdmt/ zstd} '!" 0
@@ -1709,34 +1707,20 @@ _add_xorrisofs_options_uefi-x64.grub.eltorito() {
17091707
17101708# Build bootstrap image
17111709_build_bootstrap_image () {
1712- local tarball_ext
1713-
17141710 # Set default tarball compression to uncompressed
17151711 if (( ! "${# bootstrap_tarball_compression[@]} " )) ; then
17161712 bootstrap_tarball_compression=(' cat' )
17171713 fi
17181714
1719- # Set tarball extension
1720- case " ${bootstrap_tarball_compression[0]} " in
1721- ' cat' ) tarball_ext=' ' ;;
1722- ' bzip' ) tarball_ext=' .b2z' ;;
1723- ' gzip' ) tarball_ext=' .gz' ;;
1724- ' lrzip' ) tarball_ext=' .lrz' ;;
1725- ' lzip' ) tarball_ext=' .lz' ;;
1726- ' lzop' ) tarball_ext=' .lzo' ;;
1727- ' zstd' |' zstdmt' ) tarball_ext=' .zst' ;;
1728- * ) _msg_error ' Unsupported compression!' 1 ;;
1729- esac
1730-
17311715 [[ -d " ${out_dir} " ]] || install -d -- " ${out_dir} "
17321716
17331717 cd -- " ${bootstrap_parent} "
17341718
17351719 _msg_info " Creating bootstrap image..."
1736- rm -f -- " ${out_dir:? } /${image_name:? }${tarball_ext} "
1737- bsdtar -cf - " root.${arch} " " pkglist.${arch} .txt" | " ${bootstrap_tarball_compression[@]} " > " ${out_dir} /${image_name}${tarball_ext} "
1720+ rm -f -- " ${out_dir:? } /${image_name:? } "
1721+ bsdtar -cf - " root.${arch} " " pkglist.${arch} .txt" | " ${bootstrap_tarball_compression[@]} " > " ${out_dir} /${image_name} "
17381722 _msg_info " Done!"
1739- du -h -- " ${out_dir} /${image_name}${tarball_ext} "
1723+ du -h -- " ${out_dir} /${image_name} "
17401724 cd -- " ${OLDPWD} "
17411725}
17421726
@@ -2059,6 +2043,17 @@ _build_buildmode_bootstrap() {
20592043 [[ -d " ${work_dir} " ]] || install -d -- " ${work_dir} "
20602044 install -d -m 0755 -o 0 -g 0 -- " ${pacstrap_dir} "
20612045
2046+ # Set tarball extension
2047+ case " ${bootstrap_tarball_compression[0]} " in
2048+ ' bzip' ) image_name=" ${image_name} .b2z" ;;
2049+ ' gzip' ) image_name=" ${image_name} .gz" ;;
2050+ ' lrzip' ) image_name=" ${image_name} .lrz" ;;
2051+ ' lzip' ) image_name=" ${image_name} .lz" ;;
2052+ ' lzop' ) image_name=" ${image_name} .lzo" ;;
2053+ ' xz' ) image_name=" ${image_name} .xz" ;;
2054+ ' zstd' |' zstdmt' ) image_name=" ${image_name} .zst" ;;
2055+ esac
2056+
20622057 [[ " ${quiet} " == " y" ]] || _show_config
20632058 _run_once _make_pacman_conf
20642059 _run_once _make_packages
0 commit comments