Index: sbin/dhclient/dhclient-script diff -u sbin/dhclient/dhclient-script.orig sbin/dhclient/dhclient-script --- sbin/dhclient/dhclient-script.orig Sat Jul 30 08:36:28 2005 +++ sbin/dhclient/dhclient-script Thu Sep 8 19:19:44 2005 @@ -152,6 +152,16 @@ cat /etc/resolv.conf.tail >>/etc/resolv.conf.std fi + # When resolv.conf is not changed actually, we don't + # need to update it. + # If /usr is not mounted yet, we cannot use cmp, then + # the following test fails. In such case, we simply + # ignore an error and do update resolv.conf. + if cmp -s /etc/resolv.conf.std /etc/resolv.conf; then + rm -f /etc/resolv.conf.std + return 0 + fi 2>/dev/null + # In case (e.g. during OpenBSD installs) /etc/resolv.conf # is a symbolic link, take care to preserve the link and write # the new data in the correct location.