A previous patch added post install and post uninstall scripts which use the weak-modules utility to make sure that openvswitch kernel modules are copied to the correct kernel directory. While this patch did fix some issues there are two remaining issues we have found.
1) In the case where the OS is running kernel X and the openvswitch kernel modules have been previously installed correctly and are working without a problem and then updating to Kernel X.1 we find that the correct openvswitch kernel module no longer loads. 2) In the case where a kernel module rpm has been built against an older kernel but installed on a newer kernel then the correct openvswitch kernel module will not load. This patch changes the weak-modules parameter to --add-kernel instead of --add-modules. This fixes the problem in case 1. In addition we modify the openvswitch depmod configuration file installed to the /etc/depmod.d directory and prepend a "01" to the name of the file. We then insert the first line of the file with a search path that will find weak-updates first. This change along with the change to the weak-modules utility parameters fixes the problem in case 2. I also modified the kernel module configuration file for both the rhel6 and rhel7/fedora specs to use a common "01openvswitch.conf" file name format. Cc: Flavio Leitner <[email protected]> Co-authored-by: Gurucharan Shetty <[email protected]> Signed-off-by: Greg Rose <[email protected]> --- rhel/openvswitch-kmod-fedora.spec.in | 12 +++++++----- rhel/openvswitch-kmod-rhel6.spec.in | 14 ++++++++------ rhel/openvswitch-kmod.files | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in index c0cd298..ae3a4d8 100644 --- a/rhel/openvswitch-kmod-fedora.spec.in +++ b/rhel/openvswitch-kmod-fedora.spec.in @@ -43,13 +43,15 @@ make %{_smp_mflags} -C datapath/linux rm -rf $RPM_BUILD_ROOT make INSTALL_MOD_PATH=$RPM_BUILD_ROOT -C datapath/linux modules_install mkdir -p $RPM_BUILD_ROOT/etc/depmod.d + +echo "search weak-updates updates extra built-in" >> $RPM_BUILD_ROOT/etc/depmod.d/01openvswitch.conf for module in $RPM_BUILD_ROOT/lib/modules/%{kernel}/extra/*.ko do modname="$(basename ${module})" echo "override ${modname%.ko} * extra" >> \ - $RPM_BUILD_ROOT/etc/depmod.d/kmod-openvswitch.conf + $RPM_BUILD_ROOT/etc/depmod.d/01openvswitch.conf echo "override ${modname%.ko} * weak-updates" >> \ - $RPM_BUILD_ROOT/etc/depmod.d/kmod-openvswitch.conf + $RPM_BUILD_ROOT/etc/depmod.d/01openvswitch.conf done %clean @@ -64,7 +66,7 @@ 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 + done | /sbin/weak-modules --add-kernel fi %postun @@ -76,14 +78,14 @@ if [ "$1" = 0 ]; then # Erase, not upgrade 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 + done | /sbin/weak-modules --remove-kernel fi fi %files %defattr(0644,root,root) /lib/modules/%{kernel}/extra/*.ko -/etc/depmod.d/kmod-openvswitch.conf +/etc/depmod.d/01openvswitch.conf %exclude /lib/modules/%{kernel}/modules.* %changelog diff --git a/rhel/openvswitch-kmod-rhel6.spec.in b/rhel/openvswitch-kmod-rhel6.spec.in index c6e6db5..28c7ce1 100644 --- a/rhel/openvswitch-kmod-rhel6.spec.in +++ b/rhel/openvswitch-kmod-rhel6.spec.in @@ -62,13 +62,15 @@ for flavor in %flavors_to_build ; do find $INSTALL_MOD_PATH/lib/modules -iname 'modules.*' -exec rm {} \; done install -d %{buildroot}%{_sysconfdir}/depmod.d/ + +echo "search extra/openvswitch weak-updates/openvswitch updates extra built-in weak-updates" >> 01%{oname}.conf for module in %{buildroot}/lib/modules/%{kernel_version}/$INSTALL_MOD_DIR/*.ko; do modname="$(basename ${module})" - echo "override ${modname%.ko} * extra/%{oname}" >> %{oname}.conf - echo "override ${modname%.ko} * weak-updates/%{oname}" >> %{oname}.conf + echo "override ${modname%.ko} * extra/%{oname}" >> 01%{oname}.conf + echo "override ${modname%.ko} * weak-updates/%{oname}" >> 01%{oname}.conf done -install -m 644 %{oname}.conf %{buildroot}%{_sysconfdir}/depmod.d/ +install -m 644 01%{oname}.conf %{buildroot}%{_sysconfdir}/depmod.d/ %post # Ensure that modprobe will find our modules. @@ -79,7 +81,7 @@ 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 + done | /sbin/weak-modules --add-kernel fi %postun @@ -91,13 +93,13 @@ if [ "$1" = 0 ]; then # Erase, not upgrade 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 + done | /sbin/weak-modules --remove-kernel fi fi %files %defattr(644,root,root) -/etc/depmod.d/%{oname}.conf +/etc/depmod.d/01%{oname}.conf %clean rm -rf $RPM_BUILD_ROOT diff --git a/rhel/openvswitch-kmod.files b/rhel/openvswitch-kmod.files index 357c2e8..49262f3 100644 --- a/rhel/openvswitch-kmod.files +++ b/rhel/openvswitch-kmod.files @@ -1,3 +1,3 @@ %defattr(644,root,root,755) /lib/modules/%2-%1 -/etc/depmod.d/openvswitch.conf +/etc/depmod.d/01openvswitch.conf -- 1.8.3.1 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
