rpms/dhcp/devel dhcp-3.0.2-dhclient-script-restorecon.patch, 1.1, 1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 21 19:31:52 UTC 2005
Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27873
Modified Files:
dhcp-3.0.2-dhclient-script-restorecon.patch
Log Message:
removed restorecon now that SELinux policy is fixed (bugs 155143, 153244); Removed typo (bug 155506)
dhcp-3.0.2-dhclient-script-restorecon.patch:
linux | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
Index: dhcp-3.0.2-dhclient-script-restorecon.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.2-dhclient-script-restorecon.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-3.0.2-dhclient-script-restorecon.patch 18 Apr 2005 18:08:45 -0000 1.1
+++ dhcp-3.0.2-dhclient-script-restorecon.patch 21 Apr 2005 19:31:48 -0000 1.2
@@ -1,22 +1,22 @@
---- dhcp-3.0.2/client/scripts/linux.restore_restorecon 2005-04-05 18:04:54.000000000 -0400
-+++ dhcp-3.0.2/client/scripts/linux 2005-04-18 12:31:55.123246386 -0400
-@@ -24,6 +24,7 @@
- mv $1 $1.predhclient
+--- dhcp-3.0.2/client/scripts/linux.dhclient-script-restorecon 2005-04-21 12:58:04.403432000 -0400
++++ dhcp-3.0.2/client/scripts/linux 2005-04-21 11:43:32.000000000 -0400
+@@ -20,10 +20,13 @@
+ # by the dhclient C code, and passed on.
+
+ function save_previous() {
+- if [ -e $1 -a ! -e $1.predhclient ]; then
+- mv $1 $1.predhclient
++ if [ -e $1 ]; then
++ /bin/mv $1 $1.predhclient
++ else
++ echo ''> $1.predhclient
fi
}
+
make_resolv_conf() {
if [ "${PEERDNS}" == "no" ]; then
return
-@@ -50,6 +51,7 @@
- echo nameserver $nameserver >> $rscf
- done
- change_resolv_conf $rscf
-+ [ -x /sbin/restorecon ] && /sbin/restorecon /etc/resolv.conf >/dev/null 2>&1
- rm -f $rscf
- fi
- }
-@@ -234,6 +236,10 @@
+@@ -234,6 +237,10 @@
make_resolv_conf
@@ -27,23 +27,23 @@
if [ "${PEERNIS}" = no ]; then
:
elif [ -n "$new_nis_domain" ]; then
-@@ -283,6 +289,7 @@
- do
- echo 'server '$s >> /etc/ntp.conf;
- done
-+ [ -x /sbin/restorecon ] && /sbin/restorecon /etc/ntp.conf >/dev/null 2>&1
- if [ -e /etc/ntp/step-tickers ]; then
- save_previous /etc/ntp/step-tickers
- echo '' > /etc/ntp/step-tickers
-@@ -290,6 +297,7 @@
- do
- echo $s >> /etc/ntp/step-tickers
- done;
-+ [ -x /sbin/restorecon ] && /sbin/restorecon /etc/ntp/step-tickers >/dev/null 2>&1
- fi;
- if [ -x /usr/bin/diff ] && /usr/bin/diff -q /etc/ntp.conf /etc/ntp.conf.predhclient >/dev/null 2>&1; then
- : ;
-@@ -297,10 +305,6 @@
+@@ -252,7 +259,6 @@
+ fi
+ level=`/sbin/runlevel`
+ level=${level##*\ }
+- [ -x /sbin/restorecon ] && /sbin/restorecon /etc/yp.conf >/dev/null 2>&1
+ if ! pkill -HUP ypbind && [ $contents -gt 0 ] && chkconfig --level=$level ypbind; then
+ service ypbind start >/dev/null 2>&1;
+ fi
+@@ -266,7 +272,6 @@
+ done
+ level=`/sbin/runlevel`
+ level=${level##*\ }
+- [ -x /sbin/restorecon ] && /sbin/restorecon /etc/yp.conf >/dev/null 2>&1
+ if ! pkill -HUP ypbind && [ $contents -gt 0 ] && chkconfig --level=$level ypbind; then
+ service ypbind start >/dev/null 2>&1;
+ fi
+@@ -297,10 +302,6 @@
/sbin/service ntpd condrestart >/dev/null 2>&1
fi;
fi
@@ -54,7 +54,7 @@
}
if [ x$new_broadcast_address != x ]; then
-@@ -336,7 +340,7 @@
+@@ -336,7 +337,7 @@
ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
broadcast 255.255.255.255 up
# Add route to make broadcast work. Do not omit netmask.
@@ -63,31 +63,24 @@
else
ifconfig $interface 0 up
fi
-@@ -360,18 +364,22 @@
- if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
- || [ x$reason = xSTOP ]; then
- if [ -f /etc/resolv.conf.predhclient ]; then
-- change_resolv_conf /etc/resolv.conf.predhclient
-+ change_resolv_conf /etc/resolv.conf.predhclien
-+ [ -x /sbin/restorecon ] && /sbin/restorecon /etc/resolv.conf >/dev/null 2>&1
+@@ -364,13 +365,16 @@
rm -f /etc/resolv.conf.predhclient
fi
if [ -f /etc/ntp.conf.predhclient ]; then
++ /bin/rm -f /etc/ntp.conf
/bin/mv -f /etc/ntp.conf.predhclient /etc/ntp.conf
-+ [ -x /sbin/restorecon ] && /sbin/restorecon /etc/ntp.conf >/dev/null 2>&1
if [ -f /etc/ntp/step-tickers.predhclient ]; then
++ /bin/rm -f /etc/ntp/step-tickers
/bin/mv -f /etc/ntp/step-tickers.predhclient /etc/ntp/step-tickers;
-+ [ -x /sbin/restorecon ] && /sbin/restorecon /etc/ntp/step-tickers >/dev/null 2>&1
fi
service ntpd condrestart >/dev/null 2>&1
fi
if [ -f /etc/yp.conf.predhclient ]; then
++ /bin/rm -f /etc/yp.conf
/bin/mv -f /etc/yp.conf.predhclient /etc/yp.conf
-+ [ -x /sbin/restorecon ] && /sbin/restorecon /etc/yp.conf >/dev/null 2>&1
pkill -HUP ypbind
fi
- if [ x$alias_ip_address != x ]; then
-@@ -384,7 +392,7 @@
+@@ -384,7 +388,7 @@
fi
if [ x$alias_ip_address != x ]; then
ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
More information about the fedora-cvs-commits
mailing list