PR#1: Don't use /sbin/resolvconf if it just points to resolvectl. - rpms/vpnc-script

rpms / vpnc-script

#1 Don't use /sbin/resolvconf if it just points to resolvectl.

Merged 5 years ago by nmav. Opened 5 years ago by jph.

rpms/ jph/vpnc-script master into master

Don't use /sbin/resolvconf if it just points to resolvectl.

Jim Hennessy • 5 years ago

42b7910

vpnc-script

file modified

+2 -1

		`@@ -131,7 +131,8 @@`
		`elif [ -x /usr/bin/busctl ] && [ ${RESOLVEDENABLED} = 1 ]; then # For systemd-resolved (version 229 and above)`
		`MODIFYRESOLVCONF=modify_resolved_manager`
		`RESTORERESOLVCONF=restore_resolved_manager`
		`- elif [ -x /sbin/resolvconf ]; then # Optional tool on Debian, Ubuntu, Gentoo and FreeBSD`
		`+ elif [ -x /sbin/resolvconf -a "$(basename $(readlink /sbin/resolvconf))" != 'resolvectl' ]; then`
		`+ # Optional tool on Debian, Ubuntu, Gentoo and FreeBSD`
		`MODIFYRESOLVCONF=modify_resolvconf_manager`
		`RESTORERESOLVCONF=restore_resolvconf_manager`
		`elif [ -x /sbin/netconfig ]; then # tool on Suse after 11.1`

vpnc-script.spec

file modified

+4 -1

		`@@ -3,7 +3,7 @@`

		`Name: vpnc-script`
		`Version: %{git_date}`
		`- Release: 3.git%{git_commit_hash}%{?dist}`
		`+ Release: 4.git%{git_commit_hash}%{?dist}`

		`Summary: Routing setup script for vpnc and openconnect`
		`Group: Applications/Internet`
		`@@ -35,6 +35,9 @@`
		`%{_sysconfdir}/vpnc/vpnc-script`

		`%changelog`
		`+ * Sat Dec 01 2018 James Hennessy <jphxxxx@gmail.com>`
		`+ - Fixed issue where vpnc-script is using resolvconf on systems where "resolve" isn't enabled in /etc/nsswitch.`
		`+`
		`* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20171004-3.git6f87b0f`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild`

jph commented 5 years ago

On Fedora 29 systems, resolvconf is a symbolic link to resolvectl, but
using resolvectl won't work unless "resolve" appears on the "hosts" line
of /etc/nsswitch. If we reach the point of considering resolvconf, then
"resolve" is not enabled and resolvectl should be avoided.

This pull request is to address bug report https://bugzilla.redhat.com/show_bug.cgi?id=1648108