diff options
Diffstat (limited to 'hyper-bootstrap_v0.4.sh')
-rwxr-xr-x | hyper-bootstrap_v0.4.sh | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/hyper-bootstrap_v0.4.sh b/hyper-bootstrap_v0.4.sh index fd057c5..1a174b7 100755 --- a/hyper-bootstrap_v0.4.sh +++ b/hyper-bootstrap_v0.4.sh @@ -35,7 +35,7 @@ PACMAN_PACKAGES=( libassuan libgpg-error libnghttp2 libssh2 lzo libressl pacman pacman-mirrorlist xz zlib libffi krb5 e2fsprogs keyutils libidn2 gcc-libs lz4 libpsl icu zstd readline libunistring findutils ncurses pinentry-curses lsb-release ca-certificates ca-certificates-utils p11-kit libtasn1 - libcap shadow pcre + libcap shadow pcre gzip ) BASIC_PACKAGES=(${PACMAN_PACKAGES[*]} filesystem) EXTRA_PACKAGES=(gawk file tar hyperrc) @@ -121,6 +121,7 @@ clean_chroot() { local DEST=$1 debug "Clean Chroot" rm -rf "$DEST/.BUILDINFO" "$DEST/.INSTALL" "$DEST/.MTREE" "$DEST/.PKGINFO" || true + echo '' > "$DEST/var/log/pacman.log" } configure_minimal_system() { @@ -141,6 +142,14 @@ configure_minimal_system() { sed -i "s|^[[:space:]]*SigLevel[[:space:]]*=.*$|SigLevel = Never|" "$DEST/etc/pacman.conf" } +configure_locale() { + local DEST=$1 + sed -e 's/^#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' -i "$DEST/etc/locale.gen" + echo LANG=en_US.UTF-8 > "$DEST/etc/locale.conf" + LC_ALL=C chroot "$DEST" \ + locale-gen +} + fetch_packages_list() { local REPO=$1 @@ -178,14 +187,15 @@ install_packages() { local ARCH=$1 DEST=$2 PACKAGES=$3 debug "Install packages: $PACKAGES" LC_ALL=C chroot "$DEST" \ - /usr/bin/pacman --noconfirm --arch $ARCH -Syy --force $PACKAGES + /usr/bin/pacman --noconfirm --noprogressbar --quiet --arch $ARCH -Syy --force $PACKAGES \ + && /usr/bin/pacman --noconfirm --noprogressbar --quiet -Scc } configure_keyring() { local DEST=$1 sed -i 's|SigLevel = Never|SigLevel = Required DatabaseOptional|' "$DEST/etc/pacman.conf" LC_ALL=C chroot "$DEST" \ - /usr/bin/pacman-key --init && /usr/bin/pacman-key --populate hyperbola + /usr/bin/pacman-key --init && /usr/bin/pacman-key --populate hyperbola --noconfirm --noprogressbar --quiet } show_usage() { @@ -235,6 +245,7 @@ main() { [[ -n "$USE_QEMU" ]] && configure_static_qemu "$ARCH" "$DEST" install_packages "$ARCH" "$DEST" "${BASIC_PACKAGES[*]} ${EXTRA_PACKAGES[*]}" configure_keyring "$DEST" + configure_locale "$DEST" clean_chroot "$DEST" # clean [[ -z "$PRESERVE_DOWNLOAD_DIR" ]] && rm -rf "$DOWNLOAD_DIR" |