[dhcp/f20] dhclient-script: don't eviscerate resolv.conf when mktemp fails

Jiří Popelka jpopelka at fedoraproject.org
Fri Nov 15 11:54:15 UTC 2013


commit e220d8e06b1b4ab82dd10cfb8e08c6aa38a9e9fd
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Nov 15 12:53:50 2013 +0100

    dhclient-script: don't eviscerate resolv.conf when mktemp fails

 dhclient-script |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/dhclient-script b/dhclient-script
index cedae26..41fd26f 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -110,6 +110,7 @@ make_resolv_conf() {
        [ -n "${new_domain_name_servers}" ] ||
        [ -n "${new_domain_search}" ]; then
         rscf="$(mktemp ${TMPDIR:-/tmp}/XXXXXX)"
+        [[ -z "${rscf}" ]] && return
         echo "; generated by /usr/sbin/dhclient-script" > ${rscf}
 
         if [ -n "${SEARCH}" ]; then
@@ -149,6 +150,7 @@ make_resolv_conf() {
     elif [ -n "${new_dhcp6_name_servers}" ] ||
          [ -n "${new_dhcp6_domain_search}" ]; then
         rscf="$(mktemp ${TMPDIR:-/tmp}/XXXXXX)"
+        [[ -z "${rscf}" ]] && return
         echo "; generated by /usr/sbin/dhclient-script" > ${rscf}
 
         if [ -n "${SEARCH}" ]; then


More information about the scm-commits mailing list