mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
remove LANG=C from common.sh, restore old LANG=C values
This commit is contained in:
parent
76a9dfbfe4
commit
e5a0ce3a07
3 changed files with 5 additions and 6 deletions
|
@ -87,8 +87,8 @@ build_image() {
|
||||||
# If this pipeline changes, |pipeprogs| below needs to be updated as well.
|
# If this pipeline changes, |pipeprogs| below needs to be updated as well.
|
||||||
find . -mindepth 1 -printf '%P\0' |
|
find . -mindepth 1 -printf '%P\0' |
|
||||||
sort -z |
|
sort -z |
|
||||||
bsdtar --null -cnf - -T - |
|
LANG=C bsdtar --null -cnf - -T - |
|
||||||
bsdtar --null -cf - --format=newc @- |
|
LANG=C bsdtar --null -cf - --format=newc @- |
|
||||||
$compress "${COMPRESSION_OPTIONS[@]}" > "$compressout"
|
$compress "${COMPRESSION_OPTIONS[@]}" > "$compressout"
|
||||||
pipestatus=("${PIPESTATUS[@]}")
|
pipestatus=("${PIPESTATUS[@]}")
|
||||||
pipeprogs=('find' 'sort' 'bsdtar (step 1)' 'bsdtar (step 2)' "$compress")
|
pipeprogs=('find' 'sort' 'bsdtar (step 1)' 'bsdtar (step 2)' "$compress")
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
# created by Tobias Powalowski <tpowa@archlinux.org>
|
# created by Tobias Powalowski <tpowa@archlinux.org>
|
||||||
LANG=C
|
|
||||||
. /etc/archboot/defaults
|
. /etc/archboot/defaults
|
||||||
_BASENAME=${0##*/}
|
_BASENAME=${0##*/}
|
||||||
_RUNNING_ARCH="$(uname -m)"
|
_RUNNING_ARCH="$(uname -m)"
|
||||||
|
@ -208,7 +207,7 @@ _fix_network() {
|
||||||
_create_archboot_db() {
|
_create_archboot_db() {
|
||||||
echo "Creating archboot repository db..."
|
echo "Creating archboot repository db..."
|
||||||
#shellcheck disable=SC2046
|
#shellcheck disable=SC2046
|
||||||
repo-add -q "${1}"/archboot.db.tar.gz $(find "${1}"/ -type f ! -name '*.sig')
|
LANG=C repo-add -q "${1}"/archboot.db.tar.gz $(find "${1}"/ -type f ! -name '*.sig')
|
||||||
}
|
}
|
||||||
|
|
||||||
_pacman_parameters() {
|
_pacman_parameters() {
|
||||||
|
|
|
@ -118,8 +118,8 @@ _create_initramfs() {
|
||||||
cd "${_ROOTFS_DIR}" || exit 1
|
cd "${_ROOTFS_DIR}" || exit 1
|
||||||
find . -mindepth 1 -printf '%P\0' |
|
find . -mindepth 1 -printf '%P\0' |
|
||||||
sort -z |
|
sort -z |
|
||||||
bsdtar --null -cnf - -T - |
|
LANG=C bsdtar --null -cnf - -T - |
|
||||||
bsdtar --null -cf - --format=newc @- |
|
LANG=C bsdtar --null -cf - --format=newc @- |
|
||||||
zstd --rm -T0> "${_RAM}/${_INITRD}" &
|
zstd --rm -T0> "${_RAM}/${_INITRD}" &
|
||||||
sleep 2
|
sleep 2
|
||||||
while pgrep -x zstd &>"${_NO_LOG}"; do
|
while pgrep -x zstd &>"${_NO_LOG}"; do
|
||||||
|
|
Loading…
Reference in a new issue