From dcd208eee4219b9398bfc760f88055c2e717be91 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 15 Sep 2012 16:53:54 +0200
Subject: [PATCH] virtualbox-ose: use modules-load.d(8) to load DKMS modules.

---
 srcpkgs/virtualbox-ose/files/virtualbox-guest.conf   |  3 +++
 .../virtualbox-ose/files/virtualbox-guest.service    | 12 ------------
 srcpkgs/virtualbox-ose/files/virtualbox.conf         |  3 +++
 srcpkgs/virtualbox-ose/files/virtualbox.service      | 12 ------------
 srcpkgs/virtualbox-ose/template                      |  7 +++----
 srcpkgs/virtualbox-ose/virtualbox-ose-guest.template |  3 +--
 6 files changed, 10 insertions(+), 30 deletions(-)
 create mode 100644 srcpkgs/virtualbox-ose/files/virtualbox-guest.conf
 delete mode 100644 srcpkgs/virtualbox-ose/files/virtualbox-guest.service
 create mode 100644 srcpkgs/virtualbox-ose/files/virtualbox.conf
 delete mode 100644 srcpkgs/virtualbox-ose/files/virtualbox.service

diff --git a/srcpkgs/virtualbox-ose/files/virtualbox-guest.conf b/srcpkgs/virtualbox-ose/files/virtualbox-guest.conf
new file mode 100644
index 0000000000..8f63f70f4d
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/files/virtualbox-guest.conf
@@ -0,0 +1,3 @@
+vboxguest
+vboxsf
+vboxvideo
diff --git a/srcpkgs/virtualbox-ose/files/virtualbox-guest.service b/srcpkgs/virtualbox-ose/files/virtualbox-guest.service
deleted file mode 100644
index d238809564..0000000000
--- a/srcpkgs/virtualbox-ose/files/virtualbox-guest.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Virtualbox host (de)initialization
-DefaultDependencies=no
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/sbin/modprobe -qa vboxguest vboxsf vboxvideo
-ExecStop=/sbin/modprobe -rqa vboxvideo vboxsf vboxguest
-
-[Install]
-WantedBy=graphical.target
diff --git a/srcpkgs/virtualbox-ose/files/virtualbox.conf b/srcpkgs/virtualbox-ose/files/virtualbox.conf
new file mode 100644
index 0000000000..b2856e5ded
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/files/virtualbox.conf
@@ -0,0 +1,3 @@
+vboxdrv
+vboxnetadp
+vboxnetflt
diff --git a/srcpkgs/virtualbox-ose/files/virtualbox.service b/srcpkgs/virtualbox-ose/files/virtualbox.service
deleted file mode 100644
index 9452489d8b..0000000000
--- a/srcpkgs/virtualbox-ose/files/virtualbox.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Virtualbox host (de)initialization
-DefaultDependencies=no
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/sbin/modprobe -qa vboxdrv vboxnetadp vboxnetflt
-ExecStop=/sbin/modprobe -rqa vboxnetflt vboxnetadp vboxdrv
-
-[Install]
-WantedBy=graphical.target
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 9d344399e1..38d06ad705 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -2,7 +2,7 @@
 pkgname=virtualbox-ose
 _vbox_distver=4.2.0
 version=${_vbox_distver}
-revision=1
+revision=2
 wrksrc="VirtualBox-${version}"
 patch_args="-Np1"
 depends="virtualbox-ose-dkms>=4.1.16 hicolor-icon-theme desktop-file-utils"
@@ -17,7 +17,6 @@ fi
 system_groups="vboxusers"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="${pkgname}-dkms ${pkgname}-guest ${pkgname}-guest-dkms"
-systemd_services="virtualbox.service on"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://virtualbox.org"
@@ -101,6 +100,6 @@ do_install() {
 	install -m0644 ${wrksrc}/COPYING* \
 		${DESTDIR}/usr/share/licenses/${pkgname}
 
-	# Install systemd unit.
-	vinstall ${FILESDIR}/virtualbox.service 644 usr/lib/systemd/system
+	# Install modules-load.d file.
+	vinstall ${FILESDIR}/virtualbox.conf 644 usr/lib/modules-load.d
 }
diff --git a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template
index 010f3fa16f..c7e268926e 100644
--- a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template
+++ b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template
@@ -1,7 +1,6 @@
 # Template file for 'virtualbox-ose-guest'.
 #
 depends="virtualbox-ose-guest-dkms>=$version"
-systemd_services="virtualbox-guest.service on"
 short_desc="${short_desc} - guest utilities"
 long_desc="${long_desc}
 
@@ -34,5 +33,5 @@ do_install() {
 	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
 	install -Dm755 pam_vbox.so ${DESTDIR}/usr/lib/security/pam_vbox.so
 
-	vinstall ${FILESDIR}/virtualbox-guest.service 644 usr/lib/systemd/system
+	vinstall ${FILESDIR}/virtualbox-guest.conf 644 usr/lib/modules-load.d
 }