From b527fef08de081c11a922f6d334d5b27482b2142 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Thu, 27 Jun 2024 09:24:16 +0200 Subject: [PATCH] add C.UTF-8 to base_common_system --- usr/lib/archboot/cpio/hooks/base_common_system | 5 +++++ usr/lib/archboot/cpio/hooks/base_system | 5 ----- usr/lib/archboot/iso.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/usr/lib/archboot/cpio/hooks/base_common_system b/usr/lib/archboot/cpio/hooks/base_common_system index 83ceb3a76..557600e6e 100644 --- a/usr/lib/archboot/cpio/hooks/base_common_system +++ b/usr/lib/archboot/cpio/hooks/base_common_system @@ -50,6 +50,11 @@ cgls,cgtop,confextdelta,detect-virt,escape,firstboot,hwdb,inhibit,machine-id-set resolve,repartrun,socket-activate,stdio-bridge,sysusers,tty-ask-password-agent,umount,creds,cryptenroll,dissect,\ id128,sysext} tar tee testpkg top touch trust tty unix_{chkpwd,update} /usr/lib/dbus-1.0/dbus-daemon-launch-helper \ umount.nfs{,4} update-ca-trust vercmp wc yes zstd + # add C.UTF-8 locale + _dir /usr/lib/locale + [[ -d /usr/lib/locale/C.utf8 ]] && _full_dir /usr/lib/locale/C.utf8 + # add custom locale + [[ -e "/usr/lib/locale/locale-archive" ]] && _file /usr/lib/locale/locale-archive # use patched aarch64 pacman-key # https://archlinuxarm.org/forum/viewtopic.php?f=15&t=16701 if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then diff --git a/usr/lib/archboot/cpio/hooks/base_system b/usr/lib/archboot/cpio/hooks/base_system index 0f71bc15f..d3b16e345 100644 --- a/usr/lib/archboot/cpio/hooks/base_system +++ b/usr/lib/archboot/cpio/hooks/base_system @@ -31,11 +31,6 @@ _run () [[ "${_RUNNING_ARCH}" == "riscv64" ]] && _map _binary waitpid # add file magic file _file /usr/share/file/misc/magic.mgc - # add C.UTF-8 locale - _dir /usr/lib/locale - [[ -d /usr/lib/locale/C.utf8 ]] && _full_dir /usr/lib/locale/C.utf8 - # add custom locale - [[ -e "/usr/lib/locale/locale-archive" ]] && _file /usr/lib/locale/locale-archive # add shadow _map _binary groups ch{age,fn,sh} expiry {fail,last}log \ {chg,ch,g}passwd group{add,del,mems,mod} grp{ck,conv,unconv} \ diff --git a/usr/lib/archboot/iso.sh b/usr/lib/archboot/iso.sh index aa8568ba4..cb1ba9e3f 100644 --- a/usr/lib/archboot/iso.sh +++ b/usr/lib/archboot/iso.sh @@ -184,7 +184,7 @@ _reproducibility() { _prepare_uefi_image() { echo "Preparing UEFI image..." ## get size of boot files - BOOTSIZE=$(LANG=C.UTF-8 du -bc "${_ISODIR}"/EFI "${_ISODIR}"/boot | rg '([0-9]+).*total' -r '$1') + BOOTSIZE=$(LC_ALL=C.UTF-8 du -bc "${_ISODIR}"/EFI "${_ISODIR}"/boot | rg '([0-9]+).*total' -r '$1') IMGSZ=$((BOOTSIZE/1024 + 2048)) # image size in KB VFAT_IMAGE="${_ISODIR}/efi.img" ## Creating efi.img @@ -225,7 +225,7 @@ EOF _uboot() { echo "Generating ${_ARCH} U-Boot image..." ## get size of boot files - BOOTSIZE=$(LANG=C.UTF-8 du -bc "${_ISODIR}"/boot | rg '([0-9]+).*total' -r '$1') + BOOTSIZE=$(LC_ALL=C.UTF-8 du -bc "${_ISODIR}"/boot | rg '([0-9]+).*total' -r '$1') IMGSZ=$((BOOTSIZE/1024 + 2048)) # image size in KB VFAT_IMAGE="${_ISODIR}/extlinux.img" dd if=/dev/zero of="${VFAT_IMAGE}" bs="${IMGSZ}" count=1024 status=none