diff options
| author | Jesús <heckyel@hyperbola.info> | 2021-07-31 17:09:43 -0500 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2021-07-31 17:09:43 -0500 |
| commit | 87d866c50ea8416ceaa9e5763c8e3bf5f666d520 (patch) | |
| tree | 89384a3fba492d990cd88179c85a95b367ac06a4 | |
| parent | 3c829f0b8712b8afa44a7408108c026da5ce354d (diff) | |
| download | hyperbola-bootstrap-87d866c50ea8416ceaa9e5763c8e3bf5f666d520.tar.lz hyperbola-bootstrap-87d866c50ea8416ceaa9e5763c8e3bf5f666d520.tar.xz hyperbola-bootstrap-87d866c50ea8416ceaa9e5763c8e3bf5f666d520.zip | |
Fix PGP errors
| -rwxr-xr-x | hyper-bootstrap_v0.4.sh | 10 | ||||
| -rw-r--r-- | make-bootstrap-file.sh | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/hyper-bootstrap_v0.4.sh b/hyper-bootstrap_v0.4.sh index f38afb7..00721a5 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 gzip + libcap shadow pcre gzip gettext-tiny ) BASIC_PACKAGES=(${PACMAN_PACKAGES[*]} filesystem) EXTRA_PACKAGES=(gawk file tar hyperrc) @@ -121,7 +121,10 @@ 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" + for i in $DEST/usr/share/{doc,man,info}; do + rm -rf "$i" && install -d "$i" + done + truncate -s 0 "$DEST/var/log/pacman.log" } configure_minimal_system() { @@ -130,6 +133,7 @@ configure_minimal_system() { mkdir -p "$DEST/dev" sed -ie 's|^root:.*$|root:$1$GT9AUpJe$oXANVIjIzcnmOpY07iaGi/:14657::::::|' "$DEST/etc/shadow" touch "$DEST/etc/group" + echo "nameserver 9.9.9.9" > "$DEST/etc/resolv.conf" echo "bootstrap" > "$DEST/etc/hostname" rm -f "$DEST/etc/mtab" @@ -196,7 +200,7 @@ configure_keyring() { 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 --refresh-keys + && /usr/bin/pacman-key --keyserver pgp.rediris.es --refresh-keys } show_usage() { diff --git a/make-bootstrap-file.sh b/make-bootstrap-file.sh index a723cdf..5696cf9 100644 --- a/make-bootstrap-file.sh +++ b/make-bootstrap-file.sh @@ -29,7 +29,7 @@ cd "${ROOTFS}" rm -rf var/cache/* # create new archive -cd ${RESULTPATH} +cd "${RESULTPATH}" tar --create --gzip --numeric-owner --xattrs --acls --file="hyperbola-bootstrap.tar.gz" "${ROOTFS}" # create shasum |