diff --git a/dhclient-script b/dhclient-script index b081806..d1fb166 100644 --- a/dhclient-script +++ b/dhclient-script @@ -44,14 +44,6 @@ logmessage() { logger -p ${LOGFACILITY}.${LOGLEVEL} -t "NET" "dhclient: ${msg}" } -if [ -x /usr/sbin/restorecon ]; then - fix_context() { - /usr/sbin/restorecon ${1} >/dev/null 2>&1 - } -else - fix_context() { :; } -fi - eventually_add_hostnames_domain_to_search() { # For the case when hostname for this machine has a domain that is not in domain_search list # 1) get a hostname with `ipcalc --hostname` or `hostname` @@ -145,8 +137,6 @@ make_resolv_conf() { if [ -n "${search}" ]; then eventually_add_hostnames_domain_to_search "${search}" fi - - fix_context /etc/resolv.conf elif [ -n "${new_dhcp6_name_servers}" ] || [ -n "${new_dhcp6_domain_search}" ]; then rscf="$(mktemp ${TMPDIR:-/tmp}/XXXXXX)" @@ -189,8 +179,6 @@ make_resolv_conf() { if [ -n "${search}" ]; then eventually_add_hostnames_domain_to_search "${search}" fi - - fix_context /etc/resolv.conf fi } @@ -542,7 +530,6 @@ dhconfig() { if [ -e ${tzfile} ]; then cp -fp ${tzfile} /etc/localtime touch /etc/localtime - fix_context /etc/localtime fi fi diff --git a/dhcp.spec b/dhcp.spec index db6c8c7..1cde560 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -18,7 +18,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.3.1 -Release: 14%{?dist} +Release: 15%{?dist} # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # dcantrell maintaining the package) made incorrect use of the epoch and # that's why it is at 12 now. It should have never been used, but it was. @@ -674,6 +674,10 @@ done %doc doc/html/ %changelog +* Mon Nov 10 2014 Jiri Popelka - 12:4.3.1-15 +- dhclient-script: restorecon calls shouldn't be needed + as we have SELinux transition rules (#1161500) + * Tue Nov 04 2014 Jiri Popelka - 12:4.3.1-14 - GSSAPI support for ldap authentication (#1150542)