Need s/vboxadd/vboxguest/ in the init script for version 3.1.4 and later (Bug #305583)

(Portage version: 2.1.8.3/cvs/Linux x86_64)

6 files changed, 95 insertions, 20 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index c92282763475..ff525585eae8 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.37 2010/05/11 05:39:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.38 2010/05/11 18:52:37 lack Exp $
+
+*virtualbox-guest-additions-3.1.8-r1 (11 May 2010)
+
+  11 May 2010; Jim Ramsay <lack@gentoo.org>
+  virtualbox-guest-additions-3.1.4.ebuild,
+  virtualbox-guest-additions-3.1.6.ebuild,
+  -virtualbox-guest-additions-3.1.8.ebuild,
+  +virtualbox-guest-additions-3.1.8-r1.ebuild,
+  -files/virtualbox-guest-additions-4.initd,
+  +files/virtualbox-guest-additions-5.initd,
+  +files/virtualbox-guest-additions-6.initd:
+  Need s/vboxadd/vboxguest/ in the init script for version 3.1.4 and later
+  (Bug #305583)
 
   11 May 2010; Lars Wendler <polynomial-c@gentoo.org>
   virtualbox-guest-additions-3.1.8.ebuild,
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-5.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-5.initd
new file mode 100644
index 000000000000..732aacac7b67
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-5.initd
@@ -0,0 +1,62 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+
+depend() {
+        need localmount
+	before xdm
+}
+
+createvboxdevice() {
+		local maj min
+
+		maj=`sed -n 's;\([0-9]\+\) vboxguest;\1;p' /proc/devices`
+
+		if ! [[ -z $maj ]] ; then
+			min=0
+		else
+			min=`sed -n 's;\([0-9]\+\) vboxguest;\1;p' /proc/misc`
+			if ! [[ -z $min ]] ; then
+				maj=10
+			fi
+		fi
+
+		mknod /dev/vboxguest c $maj $min -m 0664 &> /dev/null
+}
+
+start() {
+	ebegin "Starting VirtualBox guest additions"
+
+	if [[ -e /dev/vboxguest ]] ; then
+		rm -f /dev/vboxguest &> /dev/null
+	fi
+
+	einfo "	Loading kernel modules and creating devices"
+	/sbin/modprobe vboxguest &> /dev/null
+	createvboxdevice
+	/sbin/modprobe vboxvfs &> /dev/null
+
+	einfo "	Starting the vboxguest system service"
+        start-stop-daemon --start --make-pidfile \
+		--exec /usr/sbin/vboxguest-service --pidfile /var/run/vboxguest-service.pid \
+		--name vboxguest-service \
+		--background -- \
+		--foreground
+
+        eend $? "Failed to start VirtualBox guest additions"
+}
+
+stop() {
+        ebegin "Stopping VirtualBox guest additions"
+
+	einfo "	Stopping the vboxguest system service"
+	start-stop-daemon --stop --quiet \
+		--pidfile /var/run/vboxguest-service.pid --name vboxguest-service
+
+	einfo " Unloading kernel modules and removing devices"
+	/sbin/rmmod vboxvfs &> /dev/null
+	/sbin/rmmod vboxguest &> /dev/null
+	rm -f /dev/vboxguest &> /dev/null
+        eend $?
+}
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-4.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.initd
index be00ba264b12..aeb4acb7490d 100644
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-4.initd
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.initd
@@ -11,36 +11,36 @@ depend() {
 createvboxdevice() {
 		local maj min
 
-		maj=`sed -n 's;\([0-9]\+\) vboxadd;\1;p' /proc/devices`
+		maj=`sed -n 's;\([0-9]\+\) vboxguest;\1;p' /proc/devices`
 
 		if ! [[ -z $maj ]] ; then
 			min=0
 		else
-			min=`sed -n 's;\([0-9]\+\) vboxadd;\1;p' /proc/misc`
+			min=`sed -n 's;\([0-9]\+\) vboxguest;\1;p' /proc/misc`
 			if ! [[ -z $min ]] ; then
 				maj=10
 			fi
 		fi
 
-		mknod /dev/vboxadd c $maj $min -m 0664 &> /dev/null
+		mknod /dev/vboxguest c $maj $min -m 0664 &> /dev/null
 }
 
 start() {
 	ebegin "Starting VirtualBox guest additions"
 
-	if [[ -e /dev/vboxadd ]] ; then
-		rm -f /dev/vboxadd &> /dev/null
+	if [[ -e /dev/vboxguest ]] ; then
+		rm -f /dev/vboxguest &> /dev/null
 	fi
 
 	einfo "	Loading kernel modules and creating devices"
-	/sbin/modprobe vboxadd &> /dev/null
+	/sbin/modprobe vboxguest &> /dev/null
 	createvboxdevice
 	/sbin/modprobe vboxsf &> /dev/null
 
-	einfo "	Starting the vboxadd system service"
+	einfo "	Starting the vboxguest system service"
         start-stop-daemon --start --make-pidfile \
-		--exec /usr/sbin/vboxadd-service --pidfile /var/run/vboxadd-service.pid \
-		--name vboxadd-service \
+		--exec /usr/sbin/vboxguest-service --pidfile /var/run/vboxguest-service.pid \
+		--name vboxguest-service \
 		--background -- \
 		--foreground
 
@@ -50,13 +50,13 @@ start() {
 stop() {
         ebegin "Stopping VirtualBox guest additions"
 
-	einfo "	Stopping the vboxadd system service"
+	einfo "	Stopping the vboxguest system service"
 	start-stop-daemon --stop --quiet \
-		--pidfile /var/run/vboxadd-service.pid --name vboxadd-service
+		--pidfile /var/run/vboxguest-service.pid --name vboxguest-service
 
 	einfo " Unloading kernel modules and removing devices"
 	/sbin/rmmod vboxsf &> /dev/null
-	/sbin/rmmod vboxadd &> /dev/null
-	rm -f /dev/vboxadd &> /dev/null
+	/sbin/rmmod vboxguest &> /dev/null
+	rm -f /dev/vboxguest &> /dev/null
         eend $?
 }
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild
index 44e5bec7ff5d..652f7bf52bab 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild,v 1.2 2010/05/01 14:04:21 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild,v 1.3 2010/05/11 18:52:37 lack Exp $
 
 inherit eutils linux-mod
 
@@ -102,7 +102,7 @@ src_install() {
 		newins mount.vboxsf mount.vboxsf
 		fperms 4755 /sbin/mount.vboxsf
 
-		newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
+		newinitd "${FILESDIR}"/${PN}-5.initd ${PN}
 
 		insinto /usr/sbin/
 		newins VBoxService vboxguest-service
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.6.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.6.ebuild
index fe594d0870fd..be2229f7ee0a 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.6.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.6.ebuild,v 1.2 2010/05/01 14:04:21 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.6.ebuild,v 1.3 2010/05/11 18:52:37 lack Exp $
 
 inherit eutils linux-mod
 
@@ -102,7 +102,7 @@ src_install() {
 		newins mount.vboxsf mount.vboxsf
 		fperms 4755 /sbin/mount.vboxsf
 
-		newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
+		newinitd "${FILESDIR}"/${PN}-5.initd ${PN}
 
 		insinto /usr/sbin/
 		newins VBoxService vboxguest-service
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r1.ebuild
index 82dbbf527b69..b78a3c784791 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8.ebuild,v 1.2 2010/05/11 05:39:44 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r1.ebuild,v 1.1 2010/05/11 18:52:37 lack Exp $
 
 inherit eutils linux-mod
 
@@ -102,7 +102,7 @@ src_install() {
 		newins mount.vboxsf mount.vboxsf
 		fperms 4755 /sbin/mount.vboxsf
 
-		newinitd "${FILESDIR}"/${PN}-4.initd ${PN}
+		newinitd "${FILESDIR}"/${PN}-6.initd ${PN}
 
 		insinto /usr/sbin/
 		newins VBoxService vboxguest-service