e7efbe1105
Problem: - Centos 7.5 upgraded initscripts. - Porting of initscripts patches did not resolve and 'fuzz' in the line numbers of the patches. - If initscript is built by rpm 4.11, or default version of rpm until 4.14 is compiled, a fuzzy patch results in the creating of an .orig file. - Packaging of initscripts failes due to the unexpected, and unpackaged .orig file Solution: Safest solution is to de-fuzz our initscripts patches. A seperate investigation will bug report will address the broader issues. Closes-Bug: 1794611 Change-Id: I1e91a230194c0c21798b7e91b444f929b54106d6 Signed-off-by: Scott Little <scott.little@windriver.com>
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
From 11bc780fc8c7cfc7bbc59dcd84f3735c1cabfd30 Mon Sep 17 00:00:00 2001
|
|
From: Ludovic Beliveau <ludovic.beliveau@windriver.com>
|
|
Date: Mon, 30 May 2016 10:12:43 -0400
|
|
Subject: [PATCH 1/1] dhclient remove -1 arg
|
|
|
|
---
|
|
sysconfig/network-scripts/ifup-eth | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
|
|
index fdbbf13..439c4c5 100755
|
|
--- a/sysconfig/network-scripts/ifup-eth
|
|
+++ b/sysconfig/network-scripts/ifup-eth
|
|
@@ -212,7 +212,8 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
|
|
generate_lease_file_name
|
|
|
|
# Initialize the dhclient args and obtain the hostname options if needed:
|
|
- DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /var/run/dhclient-${DEVICE}.pid"
|
|
+ # DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /var/run/dhclient-${DEVICE}.pid"
|
|
+ DHCLIENTARGS="${DHCLIENTARGS} ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /var/run/dhclient-${DEVICE}.pid"
|
|
set_hostname_options DHCLIENTARGS
|
|
|
|
echo
|
|
--
|
|
1.9.1
|
|
|