X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fipfwroot.spec;h=23bb721503040fbbeb1c02b5966f0796e649e0d1;hb=bb0104c898ab07d1acf7a7531e7a9e0f3466ceb7;hp=68373b924ea15244b31239d258d1caa84dfe2c50;hpb=4e189c94aef3d3e9a4e8edfd2bb989feeb5d5e26;p=ipfw.git

diff --git a/planetlab/ipfwroot.spec b/planetlab/ipfwroot.spec
index 68373b9..23bb721 100644
--- a/planetlab/ipfwroot.spec
+++ b/planetlab/ipfwroot.spec
@@ -3,7 +3,6 @@
 #
 # TODO:
 # restart crond
-# modprobe ipfw_mod.ko (depmod ?)
 #
 %define url $URL$
 
@@ -17,7 +16,7 @@
 
 %define name ipfwroot
 %define version 0.9
-%define taglevel 7
+%define taglevel 10
 
 %define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %define kernel_id_arch %{kernel_version}-%{kernel_release}-%{kernel_arch}
@@ -59,9 +58,16 @@ rm -rf $RPM_BUILD_ROOT
 %install
 install -D -m 755 dummynet2/ipfw_mod.ko $RPM_BUILD_ROOT/lib/modules/%{kernel_id}/net/netfilter/ipfw_mod.ko
 install -D -m 755 ipfw/ipfw $RPM_BUILD_ROOT/sbin/ipfw
-install -D -m 755 planetlab/ipfw-cleanup $RPM_BUILD_ROOT/usr/bin/ipfw-cleanup
 install -D -m 644 planetlab/ipfw.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/ipfw.cron
 
+%post
+# load the module
+depmod -a
+modprobe ipfw_mod
+# clean the old database and initialize the firewall
+echo "super dbcleanup" | /vsys/ipfw-be root
+echo "super init" | /vsys/ipfw-be root
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -71,17 +77,28 @@ rm -rf $RPM_BUILD_ROOT
 %dir /lib/modules/%{kernel_id}
 /lib/modules/%{kernel_id}/net/netfilter/ipfw_mod.ko
 /sbin/ipfw
-/usr/bin/ipfw-cleanup
 %{_sysconfdir}/cron.d/ipfw.cron
 
 %postun
 # unload the module if present
 LOADED=`cat /proc/modules | grep ^ipfw_mod`; if [ -n "$LOADED" ] ; then rmmod ipfw_mod; fi
-# clean the old database and initialize the firewall
-echo "super dbcleanup" | /vsys/ipfw-be 0
-echo "super init" | /vsys/ipfw-be 0
 
 %changelog
+* Wed Mar 03 2010 Talip Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - ipfw-0.9-10
+- - Load module at installation - Marta
+
+* Mon Mar 01 2010 Marta Carbone <marta.carbone@iet.unipi.it>
+- Load the module at installation time
+
+* Mon Jan 11 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-9
+- consistent with vsys-scripts-0.95-13
+
+* Mon Jan 11 2010 Marta Carbone <marta.carbone@iet.unipi.it>
+- Integrated the ipfw rules cleanup into the backend
+
+* Sat Jan 09 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-8
+- builds on 2.6.22 & 2.6.27 - for 32 and 64 bits
+
 * Wed Jan 06 2010 Marta Carbone <marta.carbone@iet.unipi.it>
 - move to dummynet2, added support for table lookup
 - added the vsys-script dependencies and the ipfw initialization