add pacman repos dir

master
aldum 10 months ago
parent 1569e6652f
commit 3e3f792f03
  1. 35
      bin/artixstrap
  2. 5
      share/repos/arch
  3. 3
      share/repos/instant
  4. 2
      share/repos/lib32
  5. 2
      share/repos/multilib

@ -5,6 +5,7 @@ trap 'cleaner $? $LINENO' EXIT
# shellcheck source=../lib/artixstrap-common
source "$BASEDIR/"../lib/artixstrap-common
REPOS="$BASEDIR/../share/repos/"
argparse "$@"
@ -136,23 +137,24 @@ __pacman_conf() {
cp /etc/pacman.d/mirrorlist "$MOUNT/etc/pacman.d/"
[ "$ARCH" -gt 0 ] && {
mkdir -p "$MOUNT/etc/pacman.d/repos"
grep -qxF 'Include = /etc/pacman.d/repos/*' "$MOUNT/etc/pacman.conf" || \
echo -e 'Include = /etc/pacman.d/repos/*\n' >> "$MOUNT/etc/pacman.conf"
[ -n "$MULTILIB" ] && \
cp "$REPOS/"lib32 "$MOUNT/etc/pacman.d/repos/01-artix-lib32"
ls -l "$MOUNT/etc/pacman.d/repos/01-artix-lib32"
[ -n "$ARCH" ] && {
basestrap "$MOUNT" artix-archlinux-support
artix-chroot "$MOUNT" pacman-key --populate archlinux
[ -f /etc/pacman.d/mirrorlist-arch ] && \
cp /etc/pacman.d/mirrorlist-arch "$MOUNT/etc/pacman.d/"
cat >> "$MOUNT/etc/pacman.conf" << EOF
##########
## ARCH ##
##########
[extra]
Include = /etc/pacman.d/mirrorlist-arch
[community]
Include = /etc/pacman.d/mirrorlist-arch
EOF
cp "$REPOS/"arch "$MOUNT/etc/pacman.d/repos/20-arch"
[ -n "$MULTILIB" ] && \
cp "$REPOS/"multilib "$MOUNT/etc/pacman.d/repos/21-arch-multilib"
}
[ "$INSTANT" -gt 0 ] && {
[ -n "$INSTANT" ] && {
if [ -f /etc/pacman.d/instantmirrorlist ]
then
cp /etc/pacman.d/instantmirrorlist "$MOUNT/etc/pacman.d/"
@ -161,14 +163,7 @@ EOF
-O "$MOUNT/etc/pacman.d/instantmirrorlist" \
https://raw.githubusercontent.com/instantOS/instantOS/main/mirrors/amd64
fi
cat >> "$MOUNT/etc/pacman.conf" << EOF
##########
## InstantOS ##
##########
[instant]
SigLevel = Optional TrustAll
Include = /etc/pacman.d/instantmirrorlist
EOF
cp "$REPOS/"instant "$MOUNT/etc/pacman.d/repos/50-instant"
}
}

@ -0,0 +1,5 @@
[extra]
Include = /etc/pacman.d/mirrorlist-arch
[community]
Include = /etc/pacman.d/mirrorlist-arch

@ -0,0 +1,3 @@
[instant]
SigLevel = Optional TrustAll
Include = /etc/pacman.d/instantmirrorlist

@ -0,0 +1,2 @@
[lib32]
Include = /etc/pacman.d/mirrorlist

@ -0,0 +1,2 @@
[multilib]
Include = /etc/pacman.d/mirrorlist-arch
Loading…
Cancel
Save