mirror of
https://github.com/luzifer-docker/archlinux.git
synced 2024-12-20 19:11:24 +00:00
Replace pacman conf used to build the image
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
parent
cef1fdc4a4
commit
4f009fdd7b
1 changed files with 2 additions and 2 deletions
|
@ -3,7 +3,7 @@ set -euxo pipefail
|
||||||
|
|
||||||
[ $(id -u) -eq 0 ] || exec sudo bash $0 "$@"
|
[ $(id -u) -eq 0 ] || exec sudo bash $0 "$@"
|
||||||
|
|
||||||
[ -e /usr/share/devtools/pacman-extra.conf ] || {
|
[ -e /usr/share/devtools/pacman.conf.d/extra.conf ] || {
|
||||||
echo "Missing 'devtools' on this system. Please 'pacman -S devtools'."
|
echo "Missing 'devtools' on this system. Please 'pacman -S devtools'."
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
@ -35,7 +35,7 @@ trap rm_temp EXIT
|
||||||
mount --bind ${tmpdir} ${tmpdir}
|
mount --bind ${tmpdir} ${tmpdir}
|
||||||
|
|
||||||
# Pacstrap the requested packages
|
# Pacstrap the requested packages
|
||||||
env -i pacstrap -C /usr/share/devtools/pacman-extra.conf -c -G -M ${tmpdir} "${packages[@]}"
|
env -i pacstrap -C /usr/share/devtools/pacman.conf.d/extra.conf -c -G -M ${tmpdir} "${packages[@]}"
|
||||||
|
|
||||||
# Add local configurations
|
# Add local configurations
|
||||||
cp --recursive --preserve=timestamps --backup --suffix=.pacnew rootfs/* ${tmpdir}/
|
cp --recursive --preserve=timestamps --backup --suffix=.pacnew rootfs/* ${tmpdir}/
|
||||||
|
|
Loading…
Reference in a new issue