SPECS: VirtualBox.spec - added init script for vboxnetflt kernel module, us...

[hawk]

Author: hawk                         Date: Fri Dec 19 14:35:51 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added init script for vboxnetflt kernel module, users are not allowed to
  load it, package init script for vboxfs too

---- Files affected:
SPECS:
   VirtualBox.spec (1.167 -> 1.168) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.167 SPECS/VirtualBox.spec:1.168
--- SPECS/VirtualBox.spec:1.167	Fri Dec 19 15:16:50 2008
+++ SPECS/VirtualBox.spec	Fri Dec 19 15:35:46 2008
@@ -24,7 +24,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel		0.2
+%define		rel		0.3
 %define		pname	VirtualBox
 Summary:	VirtualBox OSE - x86 hardware virtualizer
 Summary(pl.UTF-8):	VirtualBox OSE - wirtualizator sprzętu x86
@@ -44,9 +44,10 @@
 # Source2-md5:	f6514091a6cca90cdc22591a789ed9b0
 Source3:	%{pname}-vboxdrv.init
 Source4:	%{pname}-vboxadd.init
-Source5:	%{pname}-vboxvfs.init
-Source6:	%{pname}.desktop
-Source7:	%{pname}.sh
+Source5:	%{pname}-vboxnetflt.init
+Source6:	%{pname}-vboxvfs.init
+Source7:	%{pname}.desktop
+Source8:	%{pname}.sh
 Patch0:		%{pname}-configure.patch
 Patch1:		%{pname}-qt-paths.patch
 Patch2:		%{pname}-shared-libstdc++.patch
@@ -304,7 +305,7 @@
 EOF
 
 install %{SOURCE1} .
-sed 's#@LIBDIR@#%{_libdir}#' < %{SOURCE7} > VirtualBox-wrapper.sh
+sed 's#@LIBDIR@#%{_libdir}#' < %{SOURCE8} > VirtualBox-wrapper.sh
 
 rm -rf PLD-MODULE-BUILD && mkdir PLD-MODULE-BUILD && cd PLD-MODULE-BUILD
 ../src/VBox/Additions/linux/export_modules modules.tar.gz
@@ -389,7 +390,7 @@
 %endif
 
 install out/linux.%{outdir}/release/bin/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
-install %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
+install %{SOURCE7} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
 
 install -d $RPM_BUILD_ROOT/etc/udev/rules.d
 install udev.conf $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules
@@ -399,7 +400,8 @@
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxdrv
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxadd
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxvfs
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetflt
+install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxvfs
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxadd/vboxadd -d misc
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxdrv/vboxdrv -d misc
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxnetflt/vboxnetflt -d misc
@@ -460,10 +462,18 @@
 
 %post	-n kernel%{_alt_kernel}-misc-vboxnetflt
 %depmod %{_kernel_ver}
+/sbin/chkconfig --add vboxnetflt
+%service vboxdrv restart "VirtualBox OSE Network Filter driver"
 
 %postun	-n kernel%{_alt_kernel}-misc-vboxnetflt
 %depmod %{_kernel_ver}
 
+%preun -n kernel%{_alt_kernel}-misc-vboxnetflt
+if [ "$1" = "0" ]; then
+	%service vboxnetflt stop
+	/sbin/chkconfig --del vboxnetflt
+fi
+
 %post	-n kernel%{_alt_kernel}-misc-vboxvfs
 %depmod %{_kernel_ver}
 /sbin/chkconfig --add vboxvfs
@@ -563,10 +573,12 @@
 
 %files -n kernel%{_alt_kernel}-misc-vboxnetflt
 %defattr(644,root,root,755)
+%attr(754,root,root) /etc/rc.d/init.d/vboxnetflt
 /lib/modules/%{_kernel_ver}/misc/vboxnetflt.ko*
 
 %files -n kernel%{_alt_kernel}-misc-vboxvfs
 %defattr(644,root,root,755)
+%attr(754,root,root) /etc/rc.d/init.d/vboxvfs
 /lib/modules/%{_kernel_ver}/misc/vboxvfs.ko*
 %endif
 
@@ -576,6 +588,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.168  2008/12/19 14:35:46  hawk
+- added init script for vboxnetflt kernel module, users are not allowed to
+  load it, package init script for vboxfs too
+
 Revision 1.167  2008/12/19 14:16:50  hawk
 - builds at x86, not tested yet
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VirtualBox.spec?r1=1.167&r2=1.168&f=u