From cb15b200e50463b72cc6f2716e4fa59b4a323d2f Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 18 Mar 2022 12:19:02 -0400 Subject: [PATCH] nixos/nixos-enter: fix resolv.conf error handling (cherry picked from commit 1ee3d9477ba01dbc3545de8cb321005dd1c7b37f) --- nixos/modules/installer/tools/nixos-enter.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh index 00883205e8b5..4e0ab6ef3e23 100644 --- a/nixos/modules/installer/tools/nixos-enter.sh +++ b/nixos/modules/installer/tools/nixos-enter.sh @@ -87,7 +87,7 @@ chroot_add_resolv_conf() { mount --bind /etc/resolv.conf "$resolv_conf" } -chroot_add_resolv_conf "$mountPoint" || print "ERROR: failed to set up resolv.conf" +chroot_add_resolv_conf "$mountPoint" || echo "$0: failed to set up resolv.conf" >&2 ( # If silent, write both stdout and stderr of activation script to /dev/null