| ... | ... | --- /dev/null |
| ... | ... | +++ b/0492-network-ifup-write-override-file-before-dhcp_do.patch |
| ... | ... | @@ -0,0 +1,43 @@ |
| 1 |
From a603e1f3a625a6f3257e6eb30bccc545c7c6f376 Mon Sep 17 00:00:00 2001
|
|
| 2 |
From: Lukas Nykryn <lnykryn@redhat.com>
|
|
| 3 |
Date: Tue, 7 Feb 2017 17:09:41 +0100
|
|
| 4 |
Subject: [PATCH] network/ifup: write override file before dhcp_do
|
|
| 5 |
|
|
| 6 |
Commit cf376023e6d0d4abd9816fa954bb917fc2557713 moved writing .resolv.conf and .override
|
|
| 7 |
after dhcp_do, because dhcp_do was overwriting .resolv.conf. But .override does not have
|
|
| 8 |
such problem and on the contrary dhcp_do reads .override file if it is present. So let\'s
|
|
| 9 |
move it back.
|
|
| 10 |
|
|
| 11 |
https://bugzilla.redhat.com/show_bug.cgi?id=1415004
|
|
| 12 |
---
|
|
| 13 |
modules.d/40network/ifup.sh | 10 +++++-----
|
|
| 14 |
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
| 15 |
|
|
| 16 |
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
|
|
| 17 |
index d7503c7..b5c9ad2 100755
|
|
| 18 |
--- a/modules.d/40network/ifup.sh
|
|
| 19 |
+++ b/modules.d/40network/ifup.sh
|
|
| 20 |
@@ -374,6 +374,11 @@ for p in $(getargs ip=); do
|
|
| 21 |
[ "$use_bridge" != 'true' ] && \
|
|
| 22 |
[ "$use_vlan" != 'true' ] && continue
|
|
| 23 |
|
|
| 24 |
+ # Store config for later use
|
|
| 25 |
+ for i in ip srv gw mask hostname macaddr mtu dns1 dns2; do
|
|
| 26 |
+ eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
|
|
| 27 |
+ done > /tmp/net.$netif.override
|
|
| 28 |
+
|
|
| 29 |
for autoopt in $(str_replace "$autoconf" "," " "); do
|
|
| 30 |
case $autoopt in
|
|
| 31 |
dhcp|on|any)
|
|
| 32 |
@@ -395,11 +400,6 @@ for p in $(getargs ip=); do
|
|
| 33 |
echo nameserver $s >> /tmp/net.$netif.resolv.conf
|
|
| 34 |
done
|
|
| 35 |
|
|
| 36 |
- # Store config for later use
|
|
| 37 |
- for i in ip srv gw mask hostname macaddr dns1 dns2 mtu; do
|
|
| 38 |
- eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
|
|
| 39 |
- done > /tmp/net.$netif.override
|
|
| 40 |
-
|
|
| 41 |
if [ $ret -eq 0 ]; then
|
|
| 42 |
> /tmp/net.${netif}.up
|
|
| 43 |
|
| ... | ... | --- a/dracut.spec |
| ... | ... | +++ b/dracut.spec |
| ... | ... | @@ -10,7 +10,7 @@ |
| 10 | 10 |
|
| 11 | 11 |
Name: dracut
|
| 12 | 12 |
Version: 033
|
| 13 |
Release: 463%{?dist}
|
|
| 13 |
Release: 463%{?dist}.1
|
|
| 14 | 14 |
|
| 15 | 15 |
Summary: Initramfs generator using udev
|
| 16 | 16 |
%if 0%{?fedora} || 0%{?rhel}
|
| ... | ... | @@ -491,6 +491,7 @@ Patch459: 0459-fcoe-only-install-etc-hba.conf-it-it-exists.patch |
| … | … | |
| 491 | 491 |
Patch460: 0460-network-parse-ip-opts-be-more-liberal-to-multiple-ip.patch
|
| 492 | 492 |
Patch461: 0461-network-fix-dhcp-classless_static_routes.patch
|
| 493 | 493 |
Patch462: 0462-network-do-not-check-firmware-boot-selected-flag.patch
|
| 494 |
Patch463: 0492-network-ifup-write-override-file-before-dhcp_do.patch
|
|
| 494 | 495 |
|
| 495 | 496 |
|
| 496 | 497 |
BuildRequires: bash git
|
| ... | ... | @@ -920,6 +921,10 @@ rm -rf -- $RPM_BUILD_ROOT |
| … | … | |
| 921 | 921 |
%endif
|
| 922 | 922 |
|
| 923 | 923 |
%changelog
|
| 924 |
* Wed Apr 26 2017 Lukáš Nykrýn <lnykryn@redhat.com> - 033-463.1
|
|
| 925 |
- network/ifup: write override file before dhcp_do
|
|
| 926 |
Resolves: rhbz#1415004
|
|
| 927 |
|
|
| 924 | 928 |
* Wed Oct 05 2016 Lukáš Nykrýn <lnykryn@redhat.com> - 033-463
|
| 925 | 929 |
- network: do not check "firmware boot selected flag"
|
| 926 | 930 |
Resolves: rhbz#1380581
|
:+1:
New comment