| Message ID | 1516204898-32292-1-git-send-email-gvrose8192@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] rhel: Ensure proper OVS kernel modules load - rhel6 | expand |
On 17 January 2018 at 08:01, Greg Rose <gvrose8192@gmail.com> wrote: > 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 <ansisatteka@gmail.com> > CC: Flavio Leitner <fbl@sysclose.org> > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > --- Acked-by: Ansis Atteka <aatteka@ovn.org>
On Wed, Jan 17, 2018 at 08:01:38AM -0800, Greg Rose wrote: > 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 <ansisatteka@gmail.com> > CC: Flavio Leitner <fbl@sysclose.org> > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > --- LGTM Acked-by: Flavio Leitner <fbl@sysclose.org>
diff --git a/rhel/openvswitch-kmod-rhel6.spec.in b/rhel/openvswitch-kmod-rhel6.spec.in index 8413b25..c6e6db5 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
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 <ansisatteka@gmail.com> CC: Flavio Leitner <fbl@sysclose.org> Signed-off-by: Greg Rose <gvrose8192@gmail.com> --- rhel/openvswitch-kmod-rhel6.spec.in | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)