[ovs-discuss] [fhs 4/4] xenserver: Install kernel modules in proper system locations.
Ben Pfaff
blp at nicira.com
Fri Aug 28 16:23:51 UTC 2009
This gets rid of the last files in /root/vswitch. With this change, the
Open vSwitch RPMs should now comply with FHS (http://www.pathname.com/fhs/).
---
xenserver/etc_init.d_vswitch | 4 ++--
xenserver/vswitch-xen.spec | 13 ++++++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch
index 643a162..87e45e1 100755
--- a/xenserver/etc_init.d_vswitch
+++ b/xenserver/etc_init.d_vswitch
@@ -88,10 +88,10 @@ function remove_all_dp {
function insert_modules_if_required {
if ! lsmod | grep -q "openvswitch_mod"; then
action "Inserting llc module" modprobe llc
- action "Inserting openvswitch module" insmod $VSWITCH_BASE/kernel_modules/openvswitch_mod.ko
+ action "Inserting openvswitch module" modprobe openvswitch_mod
fi
if [ -n "$BRCOMPATD_PIDFILE" ] && ! lsmod | grep -q "brcompat_mod"; then
- action "Inserting brcompat module" insmod $VSWITCH_BASE/kernel_modules/brcompat_mod.ko
+ action "Inserting brcompat module" modprobe brcompat_mod
fi
}
diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec
index 11294dd..68fb5bd 100644
--- a/xenserver/vswitch-xen.spec
+++ b/xenserver/vswitch-xen.spec
@@ -76,8 +76,8 @@ install -m 644 \
xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \
$RPM_BUILD_ROOT/usr/share/vswitch/scripts/XSFeatureVSwitch.py
-install -d -m 755 $RPM_BUILD_ROOT/root/vswitch/kernel_modules
-find datapath/linux-2.6 -name *.ko -exec install -m 755 \{\} $RPM_BUILD_ROOT/root/vswitch/kernel_modules/ \;
+install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/net/vswitch
+find datapath/linux-2.6 -name *.ko -exec install -m 755 \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/net/vswitch \;
# Get rid of stuff we don't want to make RPM happy.
rm \
@@ -87,7 +87,7 @@ rm \
$RPM_BUILD_ROOT/usr/bin/ovs-openflowd \
$RPM_BUILD_ROOT/usr/bin/ovs-pki \
$RPM_BUILD_ROOT/usr/bin/ovs-wdt \
- $RPM_BUILD_ROOT/root/vswitch/kernel_modules/veth_mod.ko \
+ $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/net/vswitch/veth_mod.ko \
$RPM_BUILD_ROOT/usr/sbin/ovs-monitor \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-controller.8 \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-discover.8 \
@@ -188,6 +188,9 @@ EOF
fi
%post
+# Ensure that modprobe will find our modules.
+depmod %{xen_version}
+
if grep -F net.ipv4.conf.all.arp_filter /etc/sysctl.conf >/dev/null 2>&1; then :; else
cat >>/etc/sysctl.conf <<EOF
# This works around an issue in xhad, which binds to a particular
@@ -305,8 +308,8 @@ fi
/etc/sysconfig/vswitch.example
/etc/logrotate.d/vswitch
/etc/profile.d/vswitch.sh
-/root/vswitch/kernel_modules/brcompat_mod.ko
-/root/vswitch/kernel_modules/openvswitch_mod.ko
+/lib/modules/%{xen_version}/kernel/net/vswitch/openvswitch_mod.ko
+/lib/modules/%{xen_version}/kernel/net/vswitch/brcompat_mod.ko
/usr/share/vswitch/scripts/dump-vif-details
/usr/share/vswitch/scripts/interface-reconfigure
/usr/share/vswitch/scripts/vif
--
1.6.3.3
More information about the discuss
mailing list