Skip to content

Commit

Permalink
rhel: Fix ovs-kmod-manage.sh that may create invalid soft links
Browse files Browse the repository at this point in the history
Current code iterates every kernel under '/lib/modules' for a matched
version. As a result, this script may create invalid soft links if the
matched kernel doesn't have openvswitch-kmod RPM installed.

This patch fixes it.

VMWare-BZ: #2257534

Fixes: c357051 ("rhel: add 4.4 kernel in kmod build with mulitple versions, fedora")
Signed-off-by: Yifeng Sun <pkusunyifeng@gmail.com>
Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
Signed-off-by: William Tu <u9012063@gmail.com>
  • Loading branch information
yifsun authored and Alin Gabriel Serdean committed Jul 15, 2020
1 parent 1fce4ca commit 9f9d8b2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh
Expand Up @@ -151,7 +151,7 @@ fi
#$kmod_high_ver"

found_match=false
for kname in `ls -d /lib/modules/*`
for kname in $kversion;
do
IFS='.\|-' read -r -a pkg_ver_nums <<<"${kname}"
pkg_ver=${pkg_ver_nums[$ver_offset]}
Expand All @@ -178,14 +178,14 @@ if [ "$found_match" = "false" ]; then
exit 1
fi

if [ "$requested_kernel" != "/lib/modules/$current_kernel" ]; then
if [ "$requested_kernel" != "$current_kernel" ]; then
if [ ! -d /lib/modules/$current_kernel/weak-updates/openvswitch ]; then
mkdir -p /lib/modules/$current_kernel/weak-updates
mkdir -p /lib/modules/$current_kernel/weak-updates/openvswitch
fi
for m in openvswitch vport-gre vport-stt vport-geneve \
vport-lisp vport-vxlan; do
ln -f -s $requested_kernel/extra/openvswitch/$m.ko \
ln -f -s /lib/modules/$requested_kernel/extra/openvswitch/$m.ko \
/lib/modules/$current_kernel/weak-updates/openvswitch/$m.ko
done
else
Expand Down

0 comments on commit 9f9d8b2

Please sign in to comment.