root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

add C.UTF-8 to base_common_system

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-27 09:24:16 +02:00
parent f2bf7daac1
commit b527fef08d
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
usr/lib/archboot/cpio/hooks/base_common_system
View file

@ -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

5
usr/lib/archboot/cpio/hooks/base_system
View file

@ -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} \

4
usr/lib/archboot/iso.sh
View file

@ -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