Skip to content

Commit 3f6a287

Browse files
committed
[review-fix 2] Fall back from stale resolver links
- Resolve saved relative symlink targets against /etc before validating them. - Restore the static backup when the original target disappeared, while preserving valid resolver-manager symlinks verbatim. Source: review feedback Validation: bazel build //test/new-e2e/tests/netpath/dynamic-tests:dynamic-tests_test
1 parent 1304876 commit 3f6a287

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

test/new-e2e/tests/netpath/dynamic-tests/host_traffic_dynamic_path_common_test.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,20 @@ if [ -f %s ]; then
241241
if [ -s %s ]; then
242242
target="$(cat %s)"
243243
sudo rm -f /etc/resolv.conf
244-
sudo ln -s "$target" /etc/resolv.conf
244+
case "$target" in
245+
/*) resolved_target="$target" ;;
246+
*) resolved_target="/etc/$target" ;;
247+
esac
248+
if [ -e "$resolved_target" ]; then
249+
sudo ln -s "$target" /etc/resolv.conf
250+
else
251+
sudo cp %s /etc/resolv.conf
252+
fi
245253
else
246254
sudo cp %s /etc/resolv.conf
247255
fi
248256
fi
249-
`, shellQuote(hostTrafficResolverBackupPath), shellQuote(hostTrafficResolverLinkPath), shellQuote(hostTrafficResolverLinkPath), shellQuote(hostTrafficResolverBackupPath)))
257+
`, shellQuote(hostTrafficResolverBackupPath), shellQuote(hostTrafficResolverLinkPath), shellQuote(hostTrafficResolverLinkPath), shellQuote(hostTrafficResolverBackupPath), shellQuote(hostTrafficResolverBackupPath)))
250258
if err != nil {
251259
s.T().Logf("failed to restore resolver: %v", err)
252260
}

0 commit comments

Comments
 (0)