Clone/future-install-scripts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arch-chroot: bind mount over a /etc/resolv.conf symlink

Browse Source 
Use mount's a -c/--no-canonicalize option to ensure the bind mount to
/etc/resolv.conf in the chroot directory is mounted correctly.
This avoids issues when the chroot's /etc/resolv.conf is a symlink.

Bump required util-linux version to 2.39 which supports the new mount
API.

Fixes https://github.com/archlinux/arch-install-scripts/issues/55
Related to https://github.com/util-linux/util-linux/issues/2370
This commit is contained in:
nl6720 2023-08-02 17:05:58 +03:00
parent a5b772db02
commit 4d3aec66b8
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -6,7 +6,7 @@ tasks when installing [Arch Linux](https://www.archlinux.org).
## Requirements ## Requirements
* GNU coreutils (>= v8.15) * GNU coreutils (>= v8.15)
* util-linux (>= 2.23) * util-linux (>= 2.39)
* POSIX awk * POSIX awk
* bash (>= 4.1) * bash (>= 4.1)
* asciidoc (for generating man pages) * asciidoc (for generating man pages)

26
arch-chroot.in
View File

@ -48,34 +48,20 @@ resolve_link() {
chroot_add_resolv_conf() { chroot_add_resolv_conf() {
local chrootdir=$1 local chrootdir=$1
local src local src
local dest local dest="$chrootdir/etc/resolv.conf"
src=$(resolve_link /etc/resolv.conf) src=$(resolve_link /etc/resolv.conf)
dest=$(resolve_link "$chrootdir/etc/resolv.conf" "$chrootdir")
# If we don't have a source resolv.conf file, there's nothing useful we can do. # If we don't have a source resolv.conf file, there's nothing useful we can do.
[[ -e $src ]] || return 0 [[ -e $src ]] || return 0
if [[ ! -e $dest ]]; then if [[ ! -e "$dest" && ! -h "$dest" ]]; then
# There are two reasons the destination might not exist: # There may be no resolv.conf in the chroot. In this case, we'll just exit.
# # The chroot environment must not be concerned with DNS resolution.
# 1. There may be no resolv.conf in the chroot. In this case, $dest won't exist, return 0
# and it will be equal to $1/etc/resolv.conf. In this case, we'll just exit.
# The chroot environment must not be concerned with DNS resolution.
#
# 2. $1/etc/resolv.conf is (or resolves to) a broken link. The environment
# clearly intends to handle DNS resolution, but something's wrong. Maybe it
# normally creates the target at boot time. We'll (try to) take care of it by
# creating a dummy file at the target, so that we have something to bind to.
# Case 1.
[[ $dest = $chrootdir/etc/resolv.conf ]] && return 0
# Case 2.
install -Dm644 /dev/null "$dest" || return 1
fi fi
chroot_add_mount "$src" "$dest" --bind chroot_add_mount "$src" "$dest" -c --bind
} }
arch-chroot() { arch-chroot() {