debian: install openvswitch kernel module under "updates" directory
authorAnsis Atteka <aatteka@nicira.com>
Tue, 26 May 2015 23:49:49 +0000 (16:49 -0700)
committerAnsis Atteka <aatteka@nicira.com>
Wed, 27 May 2015 01:24:59 +0000 (18:24 -0700)
This patch fixes a bug where "modprobe openvswitch" command on Ubuntu
distribution would have sometimes tried to load OVS kernel module that
shipped together with Linux Kernel, even though one had also installed
OVS datapath debian package created with module-assistant.  Because of
this issue force-reload-kmod command occasionally malfunctioned and
failed to load the right kernel module.

This bug happened *occasionally* because the default Ubuntu depmod
configuration in /etc/depmod.d/ubuntu.conf is set to look for kernel
modules first in "updates" directory, then in "ubuntu" directory and
then in other directories.  If there were two openvswitch.ko modules
in "other directories", then modprobe would have loaded kernel
module that was nondeterministically listed first by file system.

Signed-off-by: Ansis Atteka <aatteka@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
debian/rules.modules

index 2eb9440..6571683 100755 (executable)
@@ -17,7 +17,7 @@ kdist_clean:
 kdist_config: prep-deb-files
 
 .PHONY: binary-modules
-binary-modules: DSTDIR = $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel
+binary-modules: DSTDIR = $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/kernel/updates
 binary-modules: prep-deb-files
        dh_testdir
        dh_testroot