Skip to content
Snippets Groups Projects
Commit db7a90cc authored by Pierre Schmitz's avatar Pierre Schmitz
Browse files

Use pacman to determine the host's mirror

parent a9bfd8d2
No related branches found
No related tags found
No related merge requests found
...@@ -73,13 +73,13 @@ if [ -z "$cache_dir" ]; then ...@@ -73,13 +73,13 @@ if [ -z "$cache_dir" ]; then
fi fi
if [ -f /etc/pacman.d/mirrorlist ]; then if [ -f /etc/pacman.d/mirrorlist ]; then
host_mirror=$(grep -v '^#' -m1 /etc/pacman.d/mirrorlist | sed -E 's#/os/(i686|x86_64)#/os/\$arch#g') host_mirror=$(pacman -Sdp extra/devtools 2>/dev/null | sed -E 's#(.*/)extra/os/.*#\1$repo/os/$arch#')
fi fi
if [ -z "${host_mirror}" ]; then if [ -z "${host_mirror}" ]; then
host_mirror='Server = http://mirrors.kernel.org/archlinux/$repo/os/$arch' host_mirror='http://mirrors.kernel.org/archlinux/$repo/os/$arch'
fi fi
if echo "${host_mirror}" | grep -q 'file://'; then if echo "${host_mirror}" | grep -q 'file://'; then
host_mirror_path=$(echo "${host_mirror}" | sed -E 's#Server\s=\sfile://(/.*)/\$repo/os/(\$arch|i686|x86_64)#\1#g') host_mirror_path=$(echo "${host_mirror}" | sed -E 's#file://(/.*)/\$repo/os/\$arch#\1#g')
fi fi
# {{{ functions # {{{ functions
...@@ -116,7 +116,7 @@ chroot_mount() { ...@@ -116,7 +116,7 @@ chroot_mount() {
copy_hostconf () { copy_hostconf () {
chroot "${working_dir}" /bin/findmnt -rnu -o SOURCE,TARGET,FSTYPE,OPTIONS > "${working_dir}/etc/mtab" chroot "${working_dir}" /bin/findmnt -rnu -o SOURCE,TARGET,FSTYPE,OPTIONS > "${working_dir}/etc/mtab"
cp /etc/resolv.conf "${working_dir}/etc/resolv.conf" cp /etc/resolv.conf "${working_dir}/etc/resolv.conf"
echo "${host_mirror}" > ${working_dir}/etc/pacman.d/mirrorlist echo "Server = ${host_mirror}" > ${working_dir}/etc/pacman.d/mirrorlist
} }
chroot_umount () { chroot_umount () {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment