Browse Source

de-fuzz initscript patches

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>
tags/2018.10.rc1
Scott Little 1 year ago
parent
commit
e7efbe1105
17 changed files with 42 additions and 40 deletions
  1. 3
    3
      base/initscripts/centos/meta_patches/0001-Disable-zeroconf-route.patch
  2. 3
    3
      base/initscripts/centos/meta_patches/0001-Fix-Interfaces-intermittenly-do-not-come-up-on-boot.patch
  3. 3
    3
      base/initscripts/centos/meta_patches/0001-Support-PROMISC-for-interfaces-config.patch
  4. 1
    1
      base/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
  5. 3
    3
      base/initscripts/centos/meta_patches/force-delay-check-link-down.patch
  6. 3
    3
      base/initscripts/centos/meta_patches/run-ifdown-on-all-interfaces.patch
  7. 3
    3
      base/initscripts/centos/meta_patches/spec-add-mountnfs-init-script.patch
  8. 2
    2
      base/initscripts/centos/meta_patches/spec-sysconfig-affirmative-check-for-link-carrier.patch
  9. 2
    2
      base/initscripts/centos/meta_patches/spec-sysconfig-unsafe-usage-of-linkdelay-variable.patch
  10. 3
    3
      base/initscripts/centos/meta_patches/stop-creating-shared-dirs.patch
  11. 1
    1
      base/initscripts/centos/patches/0001-dhclient-remove-1-arg.patch
  12. 1
    1
      base/initscripts/centos/patches/0001-force-delay-check-link-down.patch
  13. 5
    3
      base/initscripts/centos/patches/dhclient-restrict-interfaces-to-those-on-c.patch
  14. 4
    4
      base/initscripts/centos/patches/ifup-eth-stop-waiting-if-link-is-up.patch
  15. 1
    1
      base/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch
  16. 2
    2
      base/initscripts/centos/patches/support-interface-promisc.patch
  17. 2
    2
      base/initscripts/centos/patches/support-interface-scriptlets.patch

+ 3
- 3
base/initscripts/centos/meta_patches/0001-Disable-zeroconf-route.patch View File

@@ -22,7 +22,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
22 22
 index 5349c54..6a7a76d 100644
23 23
 --- a/SPECS/initscripts.spec
24 24
 +++ b/SPECS/initscripts.spec
25
-@@ -4,12 +4,13 @@ Version: 9.49.39
25
+@@ -4,12 +4,13 @@ Version: 9.49.41
26 26
  # ppp-watch is GPLv2+, everything else is GPLv2
27 27
  License: GPLv2 and GPLv2+
28 28
  Group: System Environment/Base
@@ -37,7 +37,7 @@ index 5349c54..6a7a76d 100644
37 37
  
38 38
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
39 39
  Obsoletes: initscripts-legacy <= 9.39
40
-@@ -88,6 +89,7 @@ chmod 600 $RPM_BUILD_ROOT/etc/crypttab
40
+@@ -89,6 +90,7 @@ chmod 600 $RPM_BUILD_ROOT/etc/crypttab
41 41
  
42 42
  # WRS: Overwrite with our config
43 43
  install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/sysctl.conf
@@ -45,7 +45,7 @@ index 5349c54..6a7a76d 100644
45 45
  
46 46
  %pre
47 47
  /usr/sbin/groupadd -g 22 -r -f utmp
48
-@@ -220,6 +222,8 @@ rm -rf $RPM_BUILD_ROOT
48
+@@ -222,6 +224,8 @@ rm -rf $RPM_BUILD_ROOT
49 49
  %dir /usr/libexec/initscripts/legacy-actions
50 50
  %ghost %{_localstatedir}/log/dmesg
51 51
  %ghost %{_localstatedir}/log/dmesg.old

+ 3
- 3
base/initscripts/centos/meta_patches/0001-Fix-Interfaces-intermittenly-do-not-come-up-on-boot.patch View File

@@ -14,7 +14,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
14 14
 index 5ba669b..63ad994 100644
15 15
 --- a/SPECS/initscripts.spec
16 16
 +++ b/SPECS/initscripts.spec
17
-@@ -4,7 +4,7 @@ Version: 9.49.39
17
+@@ -4,7 +4,7 @@ Version: 9.49.41
18 18
  # ppp-watch is GPLv2+, everything else is GPLv2
19 19
  License: GPLv2 and GPLv2+
20 20
  Group: System Environment/Base
@@ -23,7 +23,7 @@ index 5ba669b..63ad994 100644
23 23
  URL: https://github.com/fedora-sysv/initscripts
24 24
  Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
25 25
  
26
-@@ -47,6 +47,7 @@ Patch4: support-interface-scriptlets.patch
26
+@@ -48,6 +48,7 @@ Patch4: support-interface-scriptlets.patch
27 27
  Patch5: relocate-dhclient-leases-to-var-run.patch
28 28
  Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
29 29
  Patch7: support-interface-promisc.patch
@@ -31,7 +31,7 @@ index 5ba669b..63ad994 100644
31 31
  
32 32
  %description
33 33
  The initscripts package contains basic system scripts used
34
-@@ -71,6 +72,7 @@ Currently, this consists of various memory checking code.
34
+@@ -72,6 +73,7 @@ Currently, this consists of various memory checking code.
35 35
  %patch5 -p1
36 36
  %patch6 -p1
37 37
  %patch7 -p1

+ 3
- 3
base/initscripts/centos/meta_patches/0001-Support-PROMISC-for-interfaces-config.patch View File

@@ -13,7 +13,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
13 13
 index 6a7a76d..6ec4bea 100644
14 14
 --- a/SPECS/initscripts.spec
15 15
 +++ b/SPECS/initscripts.spec
16
-@@ -4,7 +4,7 @@ Version: 9.49.39
16
+@@ -4,7 +4,7 @@ Version: 9.49.41
17 17
  # ppp-watch is GPLv2+, everything else is GPLv2
18 18
  License: GPLv2 and GPLv2+
19 19
  Group: System Environment/Base
@@ -22,7 +22,7 @@ index 6a7a76d..6ec4bea 100644
22 22
  URL: https://github.com/fedora-sysv/initscripts
23 23
  Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
24 24
  
25
-@@ -43,6 +43,7 @@ Provides: /sbin/service
25
+@@ -44,6 +44,7 @@ Provides: /sbin/service
26 26
  Patch4: support-interface-scriptlets.patch
27 27
  Patch5: relocate-dhclient-leases-to-var-run.patch
28 28
  Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
@@ -30,7 +30,7 @@ index 6a7a76d..6ec4bea 100644
30 30
  
31 31
  %description
32 32
  The initscripts package contains basic system scripts used
33
-@@ -66,6 +67,7 @@ Currently, this consists of various memory checking code.
33
+@@ -67,6 +68,7 @@ Currently, this consists of various memory checking code.
34 34
  %patch4 -p1
35 35
  %patch5 -p1
36 36
  %patch6 -p1

+ 1
- 1
base/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch View File

@@ -14,7 +14,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
14 14
 index df59412..fd84a75 100644
15 15
 --- a/SPECS/initscripts.spec
16 16
 +++ b/SPECS/initscripts.spec
17
-@@ -4,7 +4,7 @@ Version: 9.49.39
17
+@@ -4,7 +4,7 @@ Version: 9.49.41
18 18
  # ppp-watch is GPLv2+, everything else is GPLv2
19 19
  License: GPLv2 and GPLv2+
20 20
  Group: System Environment/Base

+ 3
- 3
base/initscripts/centos/meta_patches/force-delay-check-link-down.patch View File

@@ -13,7 +13,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
13 13
 index 63ad994..c806126 100644
14 14
 --- a/SPECS/initscripts.spec
15 15
 +++ b/SPECS/initscripts.spec
16
-@@ -4,7 +4,7 @@ Version: 9.49.39
16
+@@ -4,7 +4,7 @@ Version: 9.49.41
17 17
  # ppp-watch is GPLv2+, everything else is GPLv2
18 18
  License: GPLv2 and GPLv2+
19 19
  Group: System Environment/Base
@@ -22,7 +22,7 @@ index 63ad994..c806126 100644
22 22
  URL: https://github.com/fedora-sysv/initscripts
23 23
  Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
24 24
  
25
-@@ -48,6 +48,7 @@ Patch5: relocate-dhclient-leases-to-var-run.patch
25
+@@ -49,6 +49,7 @@ Patch5: relocate-dhclient-leases-to-var-run.patch
26 26
  Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
27 27
  Patch7: support-interface-promisc.patch
28 28
  Patch8: 0001-dhclient-remove-1-arg.patch
@@ -30,7 +30,7 @@ index 63ad994..c806126 100644
30 30
  
31 31
  %description
32 32
  The initscripts package contains basic system scripts used
33
-@@ -73,6 +74,7 @@ Currently, this consists of various memory checking code.
33
+@@ -74,6 +75,7 @@ Currently, this consists of various memory checking code.
34 34
  %patch6 -p1
35 35
  %patch7 -p1
36 36
  %patch8 -p1

+ 3
- 3
base/initscripts/centos/meta_patches/run-ifdown-on-all-interfaces.patch View File

@@ -13,7 +13,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
13 13
 index c806126..df59412 100644
14 14
 --- a/SPECS/initscripts.spec
15 15
 +++ b/SPECS/initscripts.spec
16
-@@ -4,7 +4,7 @@ Version: 9.49.39
16
+@@ -4,7 +4,7 @@ Version: 9.49.41
17 17
  # ppp-watch is GPLv2+, everything else is GPLv2
18 18
  License: GPLv2 and GPLv2+
19 19
  Group: System Environment/Base
@@ -22,7 +22,7 @@ index c806126..df59412 100644
22 22
  URL: https://github.com/fedora-sysv/initscripts
23 23
  Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
24 24
  
25
-@@ -49,6 +49,7 @@ Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
25
+@@ -50,6 +50,7 @@ Patch6: dhclient-restrict-interfaces-to-those-on-c.patch
26 26
  Patch7: support-interface-promisc.patch
27 27
  Patch8: 0001-dhclient-remove-1-arg.patch
28 28
  Patch9: 0001-force-delay-check-link-down.patch
@@ -30,7 +30,7 @@ index c806126..df59412 100644
30 30
  
31 31
  %description
32 32
  The initscripts package contains basic system scripts used
33
-@@ -75,6 +76,7 @@ Currently, this consists of various memory checking code.
33
+@@ -76,6 +77,7 @@ Currently, this consists of various memory checking code.
34 34
  %patch7 -p1
35 35
  %patch8 -p1
36 36
  %patch9 -p1

+ 3
- 3
base/initscripts/centos/meta_patches/spec-add-mountnfs-init-script.patch View File

@@ -24,7 +24,7 @@ index 6ec4bea..5ba669b 100644
24 24
  Requires: /bin/awk, sed, coreutils
25 25
  Requires: /sbin/sysctl
26 26
  Requires: grep
27
-@@ -93,6 +96,11 @@ chmod 600 $RPM_BUILD_ROOT/etc/crypttab
27
+@@ -94,6 +97,11 @@ chmod 600 $RPM_BUILD_ROOT/etc/crypttab
28 28
  install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/sysctl.conf
29 29
  install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/network
30 30
  
@@ -36,7 +36,7 @@ index 6ec4bea..5ba669b 100644
36 36
  %pre
37 37
  /usr/sbin/groupadd -g 22 -r -f utmp
38 38
  
39
-@@ -101,6 +109,7 @@ touch /var/log/wtmp /var/run/utmp /var/log/btmp
39
+@@ -104,6 +112,7 @@ touch /var/log/wtmp /var/run/utmp /var/log/btmp
40 40
  chown root:utmp /var/log/wtmp /var/run/utmp /var/log/btmp
41 41
  chmod 664 /var/log/wtmp /var/run/utmp
42 42
  chmod 600 /var/log/btmp
@@ -44,7 +44,7 @@ index 6ec4bea..5ba669b 100644
44 44
  
45 45
  /usr/sbin/chkconfig --add network
46 46
  /usr/sbin/chkconfig --add netconsole
47
-@@ -226,6 +235,8 @@ rm -rf $RPM_BUILD_ROOT
47
+@@ -228,6 +237,8 @@ rm -rf $RPM_BUILD_ROOT
48 48
  %ghost %{_localstatedir}/log/dmesg.old
49 49
  # WRS
50 50
  /etc/sysconfig/network

+ 2
- 2
base/initscripts/centos/meta_patches/spec-sysconfig-affirmative-check-for-link-carrier.patch View File

@@ -12,7 +12,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
12 12
 index fd84a75..e3748e5 100644
13 13
 --- a/SPECS/initscripts.spec
14 14
 +++ b/SPECS/initscripts.spec
15
-@@ -50,6 +50,7 @@ Patch7: support-interface-promisc.patch
15
+@@ -51,6 +51,7 @@ Patch7: support-interface-promisc.patch
16 16
  Patch8: 0001-dhclient-remove-1-arg.patch
17 17
  Patch9: 0001-force-delay-check-link-down.patch
18 18
  Patch10: run-ifdown-on-all-interfaces.patch
@@ -20,7 +20,7 @@ index fd84a75..e3748e5 100644
20 20
  
21 21
  %description
22 22
  The initscripts package contains basic system scripts used
23
-@@ -77,6 +78,7 @@ Currently, this consists of various memory checking code.
23
+@@ -78,6 +79,7 @@ Currently, this consists of various memory checking code.
24 24
  %patch8 -p1
25 25
  %patch9 -p1
26 26
  %patch10 -p1

+ 2
- 2
base/initscripts/centos/meta_patches/spec-sysconfig-unsafe-usage-of-linkdelay-variable.patch View File

@@ -12,7 +12,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
12 12
 index e3748e5..f2d0271 100644
13 13
 --- a/SPECS/initscripts.spec
14 14
 +++ b/SPECS/initscripts.spec
15
-@@ -51,6 +51,7 @@ Patch8: 0001-dhclient-remove-1-arg.patch
15
+@@ -52,6 +52,7 @@ Patch8: 0001-dhclient-remove-1-arg.patch
16 16
  Patch9: 0001-force-delay-check-link-down.patch
17 17
  Patch10: run-ifdown-on-all-interfaces.patch
18 18
  Patch11: sysconfig-affirmative-check-for-link-carrier.patch
@@ -20,7 +20,7 @@ index e3748e5..f2d0271 100644
20 20
  
21 21
  %description
22 22
  The initscripts package contains basic system scripts used
23
-@@ -79,6 +80,7 @@ Currently, this consists of various memory checking code.
23
+@@ -80,6 +81,7 @@ Currently, this consists of various memory checking code.
24 24
  %patch9 -p1
25 25
  %patch10 -p1
26 26
  %patch11 -p1

+ 3
- 3
base/initscripts/centos/meta_patches/stop-creating-shared-dirs.patch View File

@@ -11,7 +11,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
11 11
 index 7f93a30..5349c54 100644
12 12
 --- a/SPECS/initscripts.spec
13 13
 +++ b/SPECS/initscripts.spec
14
-@@ -176,10 +176,7 @@ rm -rf $RPM_BUILD_ROOT
14
+@@ -178,10 +178,7 @@ rm -rf $RPM_BUILD_ROOT
15 15
  /usr/lib/systemd/rhel-*
16 16
  /usr/lib/systemd/system/*
17 17
  /etc/inittab
@@ -22,7 +22,7 @@ index 7f93a30..5349c54 100644
22 22
  /etc/rc.d/init.d/*
23 23
  %config(noreplace) /etc/sysctl.conf
24 24
  /usr/lib/sysctl.d/00-system.conf
25
-@@ -201,7 +198,6 @@ rm -rf $RPM_BUILD_ROOT
25
+@@ -203,7 +200,6 @@ rm -rf $RPM_BUILD_ROOT
26 26
  /usr/sbin/ppp-watch
27 27
  %{_mandir}/man*/*
28 28
  %dir %attr(775,root,root) /var/run/netreport
@@ -30,7 +30,7 @@ index 7f93a30..5349c54 100644
30 30
  %dir /etc/ppp/peers
31 31
  /etc/ppp/ip-up
32 32
  /etc/ppp/ip-down
33
-@@ -209,8 +205,6 @@ rm -rf $RPM_BUILD_ROOT
33
+@@ -211,8 +207,6 @@ rm -rf $RPM_BUILD_ROOT
34 34
  /etc/ppp/ip-down.ipv6to4
35 35
  /etc/ppp/ipv6-up
36 36
  /etc/ppp/ipv6-down

+ 1
- 1
base/initscripts/centos/patches/0001-dhclient-remove-1-arg.patch View File

@@ -11,7 +11,7 @@ diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup
11 11
 index fdbbf13..439c4c5 100755
12 12
 --- a/sysconfig/network-scripts/ifup-eth
13 13
 +++ b/sysconfig/network-scripts/ifup-eth
14
-@@ -195,7 +195,8 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
14
+@@ -212,7 +212,8 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
15 15
      generate_lease_file_name
16 16
  
17 17
      # Initialize the dhclient args and obtain the hostname options if needed:

+ 1
- 1
base/initscripts/centos/patches/0001-force-delay-check-link-down.patch View File

@@ -11,7 +11,7 @@ diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scr
11 11
 index 080101b..798f28a 100644
12 12
 --- a/sysconfig/network-scripts/network-functions
13 13
 +++ b/sysconfig/network-scripts/network-functions
14
-@@ -460,7 +460,7 @@ check_link_down ()
14
+@@ -470,7 +470,7 @@ check_link_down ()
15 15
          ip link set dev $1 up >/dev/null 2>&1
16 16
      fi
17 17
      timeout=0

+ 5
- 3
base/initscripts/centos/patches/dhclient-restrict-interfaces-to-those-on-c.patch View File

@@ -29,7 +29,8 @@ diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/if
29 29
 index 7ccbddf..5b75162 100755
30 30
 --- a/sysconfig/network-scripts/ifdown-eth
31 31
 +++ b/sysconfig/network-scripts/ifdown-eth
32
-@@ -93,6 +93,6 @@ for VER in "" 6 ; do
32
+@@ -92,7 +92,7 @@ for VER in "" 6 ; do
33
+         dhcpid=$(cat /var/run/dhclient$VER-${DEVICE}.pid)
33 34
          generate_lease_file_name $VER
34 35
          if is_true "$DHCPRELEASE";  then
35 36
 -            /sbin/dhclient -r -lf ${LEASEFILE} -pf /var/run/dhclient$VER-${DEVICE}.pid ${DEVICE} >/dev/null 2>&1
@@ -41,7 +42,7 @@ diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup
41 42
 index 3da5c16..9bcf57f 100755
42 43
 --- a/sysconfig/network-scripts/ifup-eth
43 44
 +++ b/sysconfig/network-scripts/ifup-eth
44
-@@ -187,7 +187,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
45
+@@ -204,7 +204,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
45 46
      generate_lease_file_name
46 47
  
47 48
      # Initialize the dhclient args and obtain the hostname options if needed:
@@ -50,7 +51,8 @@ index 3da5c16..9bcf57f 100755
50 51
      set_hostname_options DHCLIENTARGS
51 52
  
52 53
      echo
53
-@@ -333,6 +333,6 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then
54
+@@ -354,7 +354,7 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then
55
+     echo -n $"Determining IPv6 information for ${DEVICE}..."
54 56
  
55 57
      # Initialize the dhclient args for IPv6 and obtain the hostname options if needed:
56 58
 -    DHCLIENTARGS="-6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient6-${DEVICE}.pid ${DEVICE}"

+ 4
- 4
base/initscripts/centos/patches/ifup-eth-stop-waiting-if-link-is-up.patch View File

@@ -11,7 +11,7 @@ diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup
11 11
 index 192ad18..4b8b992 100755
12 12
 --- a/sysconfig/network-scripts/ifup-eth
13 13
 +++ b/sysconfig/network-scripts/ifup-eth
14
-@@ -151,7 +151,7 @@ if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then
14
+@@ -168,7 +168,7 @@ if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then
15 15
          /sbin/ifup ${device##*/} || net_log "Unable to start slave device ${device##*/} for master ${DEVICE}." warning
16 16
      done
17 17
  
@@ -20,7 +20,7 @@ index 192ad18..4b8b992 100755
20 20
  
21 21
      # add the bits to setup the needed post enslavement parameters
22 22
      for arg in $BONDING_OPTS ; do   
23
-@@ -171,7 +171,7 @@ if [ -n "${BRIDGE}" ] && [ -x /usr/sbin/brctl ]; then
23
+@@ -188,7 +188,7 @@ if [ -n "${BRIDGE}" ] && [ -x /usr/sbin/brctl ]; then
24 24
      /sbin/ip addr flush dev ${DEVICE} 2>/dev/null
25 25
      /sbin/ip link set dev ${DEVICE} up
26 26
      ethtool_set
@@ -29,7 +29,7 @@ index 192ad18..4b8b992 100755
29 29
      /usr/sbin/brctl addif -- ${BRIDGE} ${DEVICE}
30 30
      # add the bits to setup driver parameters here
31 31
      for arg in $BRIDGING_OPTS ; do
32
-@@ -227,7 +227,7 @@ else
32
+@@ -244,7 +244,7 @@ else
33 33
          # enable device without IP, useful for e.g. PPPoE
34 34
          ip link set dev ${REALDEVICE} up
35 35
          ethtool_set
@@ -38,7 +38,7 @@ index 192ad18..4b8b992 100755
38 38
      else
39 39
  
40 40
          expand_config
41
-@@ -242,7 +242,7 @@ else
41
+@@ -259,7 +259,7 @@ else
42 42
  
43 43
          ethtool_set
44 44
  

+ 1
- 1
base/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch View File

@@ -11,7 +11,7 @@ diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup
11 11
 index 4b8b992..ccb5c75 100755
12 12
 --- a/sysconfig/network-scripts/ifup-eth
13 13
 +++ b/sysconfig/network-scripts/ifup-eth
14
-@@ -341,13 +341,14 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then
14
+@@ -363,13 +363,14 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then
15 15
      echo -n $"Determining IPv6 information for ${DEVICE}..."
16 16
  
17 17
      # Initialize the dhclient args for IPv6 and obtain the hostname options if needed:

+ 2
- 2
base/initscripts/centos/patches/support-interface-promisc.patch View File

@@ -26,7 +26,7 @@ diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup
26 26
 index 9bcf57f..fdbbf13 100755
27 27
 --- a/sysconfig/network-scripts/ifup-eth
28 28
 +++ b/sysconfig/network-scripts/ifup-eth
29
-@@ -111,6 +111,11 @@ if [ -n "${MTU}" ]; then
29
+@@ -128,6 +128,11 @@ if [ -n "${MTU}" ]; then
30 30
      ip link set dev ${DEVICE} mtu ${MTU}
31 31
  fi
32 32
  
@@ -38,7 +38,7 @@ index 9bcf57f..fdbbf13 100755
38 38
  # is the device wireless? If so, configure wireless device specifics
39 39
  is_wireless_device ${DEVICE} && . ./ifup-wireless
40 40
  
41
-@@ -130,6 +135,9 @@ if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" ]; then
41
+@@ -147,6 +152,9 @@ if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" ]; then
42 42
      }
43 43
      ethtool_set
44 44
  

+ 2
- 2
base/initscripts/centos/patches/support-interface-scriptlets.patch View File

@@ -31,7 +31,7 @@ diff --git a/sysconfig/network-scripts/ifdown-post b/sysconfig/network-scripts/i
31 31
 index 8b56e14..bd4198a 100755
32 32
 --- a/sysconfig/network-scripts/ifdown-post
33 33
 +++ b/sysconfig/network-scripts/ifdown-post
34
-@@ -61,4 +61,16 @@ if [ -x /sbin/ifdown-local ]; then
34
+@@ -69,4 +69,16 @@ if [ -x /sbin/ifdown-local ]; then
35 35
      /sbin/ifdown-local ${DEVICE}
36 36
  fi
37 37
  
@@ -69,7 +69,7 @@ diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifu
69 69
 index ab0710b..3b76492 100755
70 70
 --- a/sysconfig/network-scripts/ifup-post
71 71
 +++ b/sysconfig/network-scripts/ifup-post
72
-@@ -117,4 +117,16 @@ if [ -x /sbin/ifup-local ]; then
72
+@@ -148,4 +148,16 @@ if [ -x /sbin/ifup-local ]; then
73 73
      /sbin/ifup-local ${DEVICE}
74 74
  fi
75 75
  

Loading…
Cancel
Save