X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=transforward.spec;h=394a9b0259ed8991f64d5cf20a90f635da355f10;hb=1e03324dbd36e661ba19a86bdbfae8823f314552;hp=4a864e3b8a307fa9ca6b466fb0c90e13fa9a707a;hpb=99ebd24cce4a7cbbd0504adc43012677a5e7ef35;p=transforward.git

diff --git a/transforward.spec b/transforward.spec
index 4a864e3..394a9b0 100644
--- a/transforward.spec
+++ b/transforward.spec
@@ -1,14 +1,13 @@
 %define name transforward
 %define version 0.1
-%define taglevel 1
+%define taglevel 3
 
 ### legacy from locally-built kernels, used to define these
-# kernel_release, kernel_version and kernel_arch are expected to be set by the build to e.g.
-# kernel_release : 24.onelab  (24 is then the planetlab taglevel)
-# kernel_version : 2.6.27.57 | 2.6.32  (57 in the 27 case is the patch level)
+# kernel_release : 1.fc16  (24 is then the planetlab taglevel)
+# kernel_version : 3.3.7
 # kernel_arch :    i686 | x86_64
 
-# with the stock kernel
+# compute this with "rpm -q --qf .. kernel-devel" when with the stock kernel
 # this line below
 #%define module_release %( rpm -q --qf "%{version}" kernel-headers )
 # causes recursive macro definition no matter how much you quote
@@ -30,6 +29,7 @@ Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
 URL: %{SCMURL}
+Requires: kernel = %{kernel_version}-%{kernel_release}
 
 Summary: Kernel module that transparently forwards ports between containers
 Name: %{name}
@@ -51,15 +51,23 @@ make -C %{kernelpath} V=1 M=$(pwd) modules
 
 %install
 install -D -m 755 transforward.ko $RPM_BUILD_ROOT/lib/modules/%{kernel_id}/net/transforward/transforward.ko
+mkdir -p $RPM_BUILD_ROOT/etc/modules-load.d
+install -m 644 transforward.conf $RPM_BUILD_ROOT/etc/modules-load.d/transforward.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 /lib/modules/%{kernel_id}
+/etc/modules-load.d/transforward.conf
 
 %post
+/sbin/depmod -a
 
 %postun
 
 %changelog
+* Mon Jul 09 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-2
+- load module at boot-time
+- various tweaks, remove debugging statements
+