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

remove _KEYRING

Browse source
This commit is contained in:
Tobias Powalowski 2022-09-22 21:20:47 +02:00
parent 5d5447383a
commit ef50910de3
6 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
usr/bin/archboot-aarch64-create-container.sh
View file

@ -3,7 +3,6 @@
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/container.sh . /usr/lib/archboot/container.sh
_ARCHBOOT="archboot-arm" _ARCHBOOT="archboot-arm"
_KEYRING="archlinuxarm"
[[ -z "${1}" ]] && _usage [[ -z "${1}" ]] && _usage
_parameters "$@" _parameters "$@"
_root_check _root_check

1
usr/bin/archboot-aarch64-pacman-chroot-tarball.sh
View file

@ -5,7 +5,6 @@ _ARCH="aarch64"
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/container.sh . /usr/lib/archboot/container.sh
_LATEST_ARM64="http://os.archlinuxarm.org/os/ArchLinuxARM-aarch64-latest.tar.gz" _LATEST_ARM64="http://os.archlinuxarm.org/os/ArchLinuxARM-aarch64-latest.tar.gz"
_KEYRING="archlinuxarm"
_usage () { _usage () {
echo "CREATE AARCH64 PACMAN CHROOT" echo "CREATE AARCH64 PACMAN CHROOT"

1
usr/bin/archboot-riscv64-create-container.sh
View file

@ -3,7 +3,6 @@
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/container.sh . /usr/lib/archboot/container.sh
_ARCHBOOT="archboot-riscv" _ARCHBOOT="archboot-riscv"
_KEYRING="archlinux"
[[ -z "${1}" ]] && _usage [[ -z "${1}" ]] && _usage
_parameters "$@" _parameters "$@"
_root_check _root_check

1
usr/bin/archboot-riscv64-pacman-chroot-tarball.sh
View file

@ -6,7 +6,6 @@ _ARCH="riscv64"
. /usr/lib/archboot/container.sh . /usr/lib/archboot/container.sh
_RISCV64_VERSION="archriscv-20220727" _RISCV64_VERSION="archriscv-20220727"
_LATEST_RISCV64="https://archriscv.felixc.at/images/${_RISCV64_VERSION}.tar.zst" _LATEST_RISCV64="https://archriscv.felixc.at/images/${_RISCV64_VERSION}.tar.zst"
_KEYRING="archlinux"
_usage () { _usage () {
echo "CREATE RISCV64 PACMAN CHROOT" echo "CREATE RISCV64 PACMAN CHROOT"

1
usr/bin/archboot-x86_64-create-container.sh
View file

@ -3,7 +3,6 @@
. /usr/lib/archboot/common.sh . /usr/lib/archboot/common.sh
. /usr/lib/archboot/container.sh . /usr/lib/archboot/container.sh
_ARCHBOOT="archboot" _ARCHBOOT="archboot"
_KEYRING="archlinux"
[[ -z "${1}" ]] && _usage [[ -z "${1}" ]] && _usage
_parameters "$@" _parameters "$@"
_root_check _root_check

2
usr/lib/archboot/common.sh
View file

@ -70,7 +70,7 @@ _generate_keyring() {
# generate pacman keyring # generate pacman keyring
echo "Generate pacman keyring in container ..." echo "Generate pacman keyring in container ..."
systemd-nspawn -q -D "${1}" pacman-key --init >/dev/null 2>&1 systemd-nspawn -q -D "${1}" pacman-key --init >/dev/null 2>&1
systemd-nspawn -q -D "${1}" pacman-key --populate "${_KEYRING}" >/dev/null 2>&1 systemd-nspawn -q -D "${1}" pacman-key --populate >/dev/null 2>&1
else else
cp -ar /etc/pacman.d/gnupg "${1}"/etc/pacman.d >/dev/null 2>&1 cp -ar /etc/pacman.d/gnupg "${1}"/etc/pacman.d >/dev/null 2>&1
fi fi