
Create new directories: ceph config config-files filesystem kernel kernel/kernel-modules ldap logging strorage-drivers tools utilities virt Retire directories: connectivity core devtools support extended Delete two packages: tgt irqbalance Relocated packages: base/ dhcp initscripts libevent lighttpd linuxptp memcached net-snmp novnc ntp openssh pam procps sanlock shadow sudo systemd util-linux vim watchdog ceph/ python-cephclient config/ facter puppet-4.8.2 puppet-modules filesystem/ e2fsprogs nfs-utils nfscheck kernel/ kernel-std kernel-rt kernel/kernel-modules/ mlnx-ofa_kernel ldap/ nss-pam-ldapd openldap logging/ syslog-ng logrotate networking/ lldpd iproute mellanox python-ryu mlx4-config python/ python-2.7.5 python-django python-gunicorn python-setuptools python-smartpm python-voluptuous security/ shim-signed shim-unsigned tboot strorage-drivers/ python-3parclient python-lefthandclient virt/ cloud-init libvirt libvirt-python qemu tools/ storage-topology vm-topology utilities/ tis-extensions namespace-utils nova-utils update-motd Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86 Story: 2002801 Task: 22687 Signed-off-by: Scott Little <scott.little@windriver.com>
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From d3d109136f6e01ec1d8291ff89f3e00ff64cab31 Mon Sep 17 00:00:00 2001
|
|
From: Allain Legacy <allain.legacy@windriver.com>
|
|
Date: Thu, 17 Nov 2016 11:37:38 -0500
|
|
Subject: [PATCH] sysconfig: unsafe usage of linkdelay variable
|
|
|
|
If the LINKDELAY variable is an alphabetic string instead of an integer then
|
|
the calculation in check_link_down() causes delay to be set to 0. That causes
|
|
the loop to never execute and for the caller to think that the link is always
|
|
down.
|
|
|
|
This does not address but is related to CGTS-5821
|
|
|
|
Signed-off-by: Allain Legacy <allain.legacy@windriver.com>
|
|
---
|
|
sysconfig/network-scripts/network-functions | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
|
|
index affa8ba..a9821f6 100644
|
|
--- a/sysconfig/network-scripts/network-functions
|
|
+++ b/sysconfig/network-scripts/network-functions
|
|
@@ -461,7 +461,7 @@ check_link_down ()
|
|
fi
|
|
timeout=0
|
|
delay=20
|
|
- [ -n "$LINKDELAY" ] && delay=$(($LINKDELAY * 2))
|
|
+ [[ $LINKDELAY =~ ^[0-9]+$ ]] && delay=$(($LINKDELAY * 2))
|
|
while [ $timeout -le $delay ]; do
|
|
[ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" == "1" ] && return 1
|
|
usleep 500000
|
|
--
|
|
1.9.1
|
|
|