From 43bc5b40ce0fac762e8b1be7d2ca5718b9109706 Mon Sep 17 00:00:00 2001
From: Davide Depau <davide@depau.eu>
Date: Sat, 20 Mar 2021 15:09:06 +0100
Subject: [PATCH] Ensure pacman.conf is copied to the new root
---
Dockerfile.aarch64 | 1 +
Dockerfile.x86_64 | 1 +
pacstrap-docker | 4 +++-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index d3ef511..b6bf82b 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -5,6 +5,7 @@ WORKDIR /archlinux
RUN mkdir -p /archlinux/rootfs
COPY rootfs/alarm/etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist
+COPY rootfs/archlinux/etc/pacman.conf /etc/pacman.conf
COPY pacstrap-docker /archlinux/
RUN ./pacstrap-docker /archlinux/rootfs \
diff --git a/Dockerfile.x86_64 b/Dockerfile.x86_64
index 04437d0..2b89449 100644
--- a/Dockerfile.x86_64
+++ b/Dockerfile.x86_64
@@ -5,6 +5,7 @@ WORKDIR /archlinux
RUN mkdir -p /archlinux/rootfs
COPY rootfs/archlinux/etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist
+COPY rootfs/archlinux/etc/pacman.conf /etc/pacman.conf
COPY pacstrap-docker /archlinux/
RUN ./pacstrap-docker /archlinux/rootfs \
diff --git a/pacstrap-docker b/pacstrap-docker
index 646aca8..858bcb9 100755
--- a/pacstrap-docker
+++ b/pacstrap-docker
@@ -15,9 +15,11 @@ fi
[[ -d $newroot ]] || die "%s is not a directory" "$newroot"
echo 'Creating install root at %s' "$newroot"
-mkdir -m 0755 -p "$newroot"/var/{cache/pacman/pkg,lib/pacman,log} "$newroot"/{dev,run,etc}
+mkdir -m 0755 -p "$newroot"/var/{cache/pacman/pkg,lib/pacman,log} "$newroot"/{dev,run,etc} "$newroot"/etc/pacman.d
mkdir -m 1777 -p "$newroot"/tmp
mkdir -m 0555 -p "$newroot"/{sys,proc}
+cp -a /etc/pacman.conf "$newroot/etc/pacman.conf"
+cp -a /etc/pacman.d/mirrorlist "$newroot/etc/pacman.d/mirrorlist"
echo 'Creating /dev/null in new root'
mknod "$newroot/dev/null" c 1 3