packages: VirtualBox/VirtualBox.spec, VirtualBox/VirtualBox-vboxsf.init - s...

[pluto]

Author: pluto                        Date: Thu May 27 18:40:41 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- s/vboxvfs/vboxsf/

---- Files affected:
packages/VirtualBox:
   VirtualBox.spec (1.275 -> 1.276) , VirtualBox-vboxsf.init (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.275 packages/VirtualBox/VirtualBox.spec:1.276
--- packages/VirtualBox/VirtualBox.spec:1.275	Sun May 16 15:44:01 2010
+++ packages/VirtualBox/VirtualBox.spec	Thu May 27 20:40:35 2010
@@ -46,7 +46,7 @@
 Source3:	%{pname}-vboxdrv.init
 Source4:	%{pname}-vboxguest.init
 Source5:	%{pname}-vboxnetflt.init
-Source6:	%{pname}-vboxvfs.init
+Source6:	%{pname}-vboxsf.init
 Source7:	%{pname}-vboxnetadp.init
 Source8:	%{pname}.sh
 Source9:	mount.vdi
@@ -473,7 +473,7 @@
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxdrv
 install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxguest
 install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetflt
-install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxvfs
+install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxsf
 install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/vboxnetadp
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxdrv/vboxdrv -d misc
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxguest/vboxguest -d misc
@@ -740,7 +740,7 @@
 
 %files -n kernel%{_alt_kernel}-misc-vboxsf
 %defattr(644,root,root,755)
-%attr(754,root,root) /etc/rc.d/init.d/vboxvfs
+%attr(754,root,root) /etc/rc.d/init.d/vboxsf
 %attr(755,root,root) %{_sbindir}/mount.vboxsf
 /lib/modules/%{_kernel_ver}/misc/vboxsf.ko*
 
@@ -755,6 +755,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.276  2010/05/27 18:40:35  pluto
+- s/vboxvfs/vboxsf/
+
 Revision 1.275  2010/05/16 13:44:01  pluto
 - updated to 3.1.8, release 0.1 (vboxvfs.init needs cvs-server-side rename).
 

================================================================
Index: packages/VirtualBox/VirtualBox-vboxsf.init
diff -u packages/VirtualBox/VirtualBox-vboxsf.init:1.2 packages/VirtualBox/VirtualBox-vboxsf.init:1.3
--- packages/VirtualBox/VirtualBox-vboxsf.init:1.2	Mon Nov 24 11:55:06 2008
+++ packages/VirtualBox/VirtualBox-vboxsf.init	Thu May 27 20:40:35 2010
@@ -12,24 +12,24 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
-VBOX_DEVICE="/dev/vboxvfs"
-VBOX_MODULE="vboxvfs"
+VBOX_DEVICE="/dev/vboxsf"
+VBOX_MODULE="vboxsf"
 
 # Get service config - may override defaults
 [ -f /etc/sysconfig/virtualbox ] && . /etc/sysconfig/virtualbox
 
 start() {
-	if [ ! -f /var/lock/subsys/vboxvfs ]; then
+	if [ ! -f /var/lock/subsys/vboxsf ]; then
 		modprobe -s $VBOX_MODULE
 		# set proper /dev/vboxdrv for systems with static dev
-		touch /var/lock/subsys/vboxvfs
+		touch /var/lock/subsys/vboxsf
 	fi
 }
 
 stop() {
 	# NOTE: rmmod will wait if device is in use, so automatic rmmod probably is not the best idea
 	/sbin/rmmod $VBOX_MODULE
-	rm -f /var/lock/subsys/vboxvfs
+	rm -f /var/lock/subsys/vboxsf
 }
 
 RETVAL=0
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.275&r2=1.276&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox-vboxsf.init?r1=1.2&r2=1.3&f=u