updater8-25

2 files changed, 28 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c54ca3b4..dc1e503b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,29 @@
 2006-02-02  Bill Nottingham  <notting@redhat.com>
 
+	* ChangeLog, initscripts.spec: 8.25-1
+
+2006-02-02  Miloslav Trmac  <mitr@redhat.com>
+
+	* rc.d/init.d/functions (get_numeric_dev):
+	On second thought, write directly what we want awk to do.
+
+2006-02-02  Bill Nottingham  <notting@redhat.com>
+
+	* sysconfig/network-scripts/ifup-eth:
+	move the arping to before we actually add the address. If the address
+	is already on the device, it's a little late... (fixes a xen issue)
+
+2006-02-02  Miloslav Trmac  <mitr@redhat.com>
+
+	* po/cs.po:
+	Change "  OK  " translation to try and make the output aligned again.
+
+2006-02-02  Severin Heiniger  <heinigerseverin@gmail.com>
+
+	* po/de.po: corrections and updates
+
+2006-02-02  Bill Nottingham  <notting@redhat.com>
+
 	* ChangeLog, initscripts.spec: 8.24-1
 
 	* rc.d/init.d/functions: fix sendmail startup
diff --git a/initscripts.spec b/initscripts.spec
index 7c1f0bea..ae96dd6c 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 8.24
+Version: 8.25
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -208,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Thu Feb  2 2006 Bill Nottingham <notting@redhat.com> 8.25-1
+- ifup: don't run the arping check if the address is already on the device
+
 * Wed Feb  1 2006 Bill Nottingham <notting@redhat.com> 8.24-1
 - init.d/functions: fix sendmail startup
 - sysconfig.txt: fix typos (<mitr@redhat.com>)