diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2022-03-18 12:19:09 -0400 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-03-19 01:13:20 +0000 |
| commit | 66796ab0e1f81084044c2ee3a6d62ac5a25c4b44 (patch) | |
| tree | 16f0d8268d2f85387bec9bdec2bb14e94e6bb168 | |
| parent | nixos/nixos-enter: fix resolv.conf error handling (diff) | |
| download | nixpkgs-origin/backport-164735-to-release-21.11.tar.gz | |
nixos/nixos-enter: cleanup resolv.conf handlingorigin/backport-164735-to-release-21.11
(cherry picked from commit 69cff425e6654786fdacbdc495a4f560fcdc7c61)
| -rw-r--r-- | nixos/modules/installer/tools/nixos-enter.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh index 4e0ab6ef3e23..8854329ccab7 100644 --- a/nixos/modules/installer/tools/nixos-enter.sh +++ b/nixos/modules/installer/tools/nixos-enter.sh @@ -62,29 +62,29 @@ mount --rbind /sys "$mountPoint/sys" # modified from https://github.com/archlinux/arch-install-scripts/blob/bb04ab435a5a89cd5e5ee821783477bc80db797f/arch-chroot.in#L26-L52 chroot_add_resolv_conf() { - local chrootdir=$1 resolv_conf=$1/etc/resolv.conf + local chrootDir="$1" resolvConf="$1/etc/resolv.conf" [[ -e /etc/resolv.conf ]] || return 0 # Handle resolv.conf as a symlink to somewhere else. - if [[ -L $chrootdir/etc/resolv.conf ]]; then + if [[ -L "$resolvConf" ]]; then # readlink(1) should always give us *something* since we know at this point # it's a symlink. For simplicity, ignore the case of nested symlinks. - # We also ignore the possibility if `../`s escaping the root. - resolv_conf=$(readlink "$chrootdir/etc/resolv.conf") - if [[ $resolv_conf = /* ]]; then - resolv_conf=$chrootdir$resolv_conf + # We also ignore the possibility of `../`s escaping the root. + resolvConf="$(readlink "$resolvConf")" + if [[ "$resolvConf" = /* ]]; then + resolvConf="$chrootDir$resolvConf" else - resolv_conf=$chrootdir/etc/$resolv_conf + resolvConf="$chrootDir/etc/$resolvConf" fi fi # ensure file exists to bind mount over - if [[ ! -f $resolv_conf ]]; then - install -Dm644 /dev/null "$resolv_conf" || return 1 + if [[ ! -f "$resolvConf" ]]; then + install -Dm644 /dev/null "$resolvConf" || return 1 fi - mount --bind /etc/resolv.conf "$resolv_conf" + mount --bind /etc/resolv.conf "$resolvConf" } chroot_add_resolv_conf "$mountPoint" || echo "$0: failed to set up resolv.conf" >&2 |