[dhcp] 4.2.4rc1

[Jiří Popelka]

commit efe27aa872a323b5ff69afa85b315e6b15e03b34
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Apr 27 12:33:53 2012 +0200

    4.2.4rc1

 .gitignore      |    1 +
 dhclient-script |    3 +++
 dhcp.spec       |    7 +++++--
 sources         |    3 +--
 4 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b16a929..d5c2f96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /dhcp-4.2.3-P1.tar.gz
 /dhcp-4.2.3-P2.tar.gz
 /dhcp-4.2.4b1.tar.gz
+/dhcp-4.2.4rc1.tar.gz
diff --git a/dhclient-script b/dhclient-script
index 3425e4b..814508b 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -661,6 +661,9 @@ case "${reason}" in
             ip -4 addr flush dev ${interface} label ${interface}:0 >/dev/null 2>&1
         fi
 
+        # upstream dhclient-script removes (ifconfig $interface 0 up) old adresses in PREINIT,
+        # but we sometimes (#125298) need (for iSCSI/nfs root to have a dhcp interface) to keep the existing ip
+        # flush_dev ${interface}
         ip link set dev ${interface} up
         if [ -n "${DHCLIENT_DELAY}" ] && [ ${DHCLIENT_DELAY} -gt 0 ]; then
             # We need to give the kernel some time to get the interface up.
diff --git a/dhcp.spec b/dhcp.spec
index 68c6f80..82b8901 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -9,7 +9,7 @@
 
 
 #%%global patchver P2
-%global prever b1
+%global prever rc1
 
 
 #%%global VERSION %{version}
@@ -19,7 +19,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.4
-Release:  0.3.%{prever}%{?dist}
+Release:  0.4.%{prever}%{?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.
@@ -600,6 +600,9 @@ fi
 
 
 %changelog
+* Tue May 01 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.4-0.4.rc1
+- 4.2.4rc1
+
 * Thu Apr 26 2012 Jiri Popelka <jpopelka at redhat.com> - 12:4.2.4-0.3.b1
 - remove inherit-leases.patch - it's probably not needed anymore (#815355)
 
diff --git a/sources b/sources
index 64fb9ad..8a29abd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-14f57fd580d01633d0fad4809007a801  dhcp-4.2.3-P2.tar.gz
-50f45d0436417e777d5b6040d7a38c48  dhcp-4.2.4b1.tar.gz
+7300d05b7b04495e54d6c40247d11882  dhcp-4.2.4rc1.tar.gz