From 69f7e92f2913a98572522275f8273a0fa34f3472 Mon Sep 17 00:00:00 2001 From: Greg Rose Date: Wed, 17 Jan 2018 08:01:38 -0800 Subject: [PATCH] rhel: Ensure proper OVS kernel modules load - rhel6 Patch c49889cf3e "rhel: Ensure proper OVS kernel modules load after upgrade" did not address the RHEL 6 kmod rpm spec file. This patch addresses that error. Fixes: c49889cf3e ("rhel: Ensure proper OVS kernel modules...") CC: Ansis Atteka CC: Flavio Leitner Signed-off-by: Greg Rose Acked-by: Ansis Atteka --- rhel/openvswitch-kmod-rhel6.spec.in | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/rhel/openvswitch-kmod-rhel6.spec.in b/rhel/openvswitch-kmod-rhel6.spec.in index 8413b254f9f..c6e6db5d093 100644 --- a/rhel/openvswitch-kmod-rhel6.spec.in +++ b/rhel/openvswitch-kmod-rhel6.spec.in @@ -70,6 +70,31 @@ do done install -m 644 %{oname}.conf %{buildroot}%{_sysconfdir}/depmod.d/ +%post +# Ensure that modprobe will find our modules. +for k in $(cd /lib/modules && /bin/ls); do + [ -d "/lib/modules/$k/kernel/" ] && depmod -a "$k" +done +if [ -x "/sbin/weak-modules" ]; then + for m in openvswitch vport-gre vport-stt vport-geneve \ + vport-lisp vport-vxlan; do + echo "/lib/modules/%{kernel}/extra/$m.ko" + done | /sbin/weak-modules --add-modules +fi + +%postun +for k in $(cd /lib/modules && /bin/ls); do + [ -d "/lib/modules/$k/kernel/" ] && depmod -a "$k" +done +if [ "$1" = 0 ]; then # Erase, not upgrade + if [ -x "/sbin/weak-modules" ]; then + for m in openvswitch vport-gre vport-stt vport-geneve \ + vport-lisp vport-vxlan; do + echo "/lib/modules/%{kernel}/extra/$m.ko" + done | /sbin/weak-modules --remove-modules + fi +fi + %files %defattr(644,root,root) /etc/depmod.d/%{oname}.conf