Author: baggins Date: Tue Feb 14 18:32:53 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- systemd support in the form of kernel loader configs,
and masked kernel-loading services - let systemd handle it
---- Files affected:
packages/VirtualBox:
VirtualBox.spec (1.415 -> 1.416) , VirtualBox-vboxdrv-modules-load.conf
(NONE -> 1.1) (NEW), VirtualBox-vboxguest-modules-load.conf (NONE -> 1.1)
(NEW), VirtualBox-vboxnetadp-modules-load.conf (NONE -> 1.1) (NEW),
VirtualBox-vboxnetflt-modules-load.conf (NONE -> 1.1) (NEW),
VirtualBox-vboxpci-modules-load.conf (NONE -> 1.1) (NEW),
VirtualBox-vboxsf-modules-load.conf (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.415
packages/VirtualBox/VirtualBox.spec:1.416
--- packages/VirtualBox/VirtualBox.spec:1.415 Tue Feb 14 19:07:36 2012
+++ packages/VirtualBox/VirtualBox.spec Tue Feb 14 19:32:47 2012
@@ -55,6 +55,12 @@
Source9: %{pname}.sh
Source10: mount.vdi
Source11: udev.rules
+Source12: %{pname}-vboxdrv-modules-load.conf
+Source13: %{pname}-vboxguest-modules-load.conf
+Source14: %{pname}-vboxnetflt-modules-load.conf
+Source15: %{pname}-vboxsf-modules-load.conf
+Source16: %{pname}-vboxnetadp-modules-load.conf
+Source17: %{pname}-vboxpci-modules-load.conf
Patch0: %{pname}-configure-spaces.patch
Patch1: %{pname}-export_modules.patch
Patch2: %{pname}-VBoxSysInfo.patch
@@ -623,6 +629,21 @@
install -p mount.vboxsf $RPM_BUILD_ROOT%{_sbindir}/mount.vboxsf
+# Tell systemd to load modules
+install -p %{SOURCE12} $RPM_BUILD_ROOT/etc/modules-load.d/vboxdrv.conf
+install -p %{SOURCE13} $RPM_BUILD_ROOT/etc/modules-load.d/vboxguest.conf
+install -p %{SOURCE14} $RPM_BUILD_ROOT/etc/modules-load.d/vboxnetflt.conf
+install -p %{SOURCE15} $RPM_BUILD_ROOT/etc/modules-load.d/vboxsf.conf
+install -p %{SOURCE16} $RPM_BUILD_ROOT/etc/modules-load.d/vboxnetadp.conf
+install -p %{SOURCE17} $RPM_BUILD_ROOT/etc/modules-load.d/vboxpci.conf
+
+# And mask module-loading services
+ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxdrv.service
+ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxguest.service
+ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxnetflt.service
+ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxsf.service
+ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxnetadp.service
+ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/vboxpci.service
%endif
%clean
@@ -912,31 +933,43 @@
%files -n kernel%{_alt_kernel}-misc-vboxguest
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/vboxguest
+%config(noreplace) %verify(not md5 mtime size)
/etc/modules-load.d/vboxguest.conf
+%{systemdunitdir}/vboxguest.service
/lib/modules/%{_kernel_ver}/misc/vboxguest.ko*
%files -n kernel%{_alt_kernel}-misc-vboxdrv
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/vboxdrv
+%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxdrv.conf
+%{systemdunitdir}/vboxdrv.service
/lib/modules/%{_kernel_ver}/misc/vboxdrv.ko*
%files -n kernel%{_alt_kernel}-misc-vboxnetadp
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/vboxnetadp
+%config(noreplace) %verify(not md5 mtime size)
/etc/modules-load.d/vboxnetadp.conf
+%{systemdunitdir}/vboxnetadp.service
/lib/modules/%{_kernel_ver}/misc/vboxnetadp.ko*
%files -n kernel%{_alt_kernel}-misc-vboxnetflt
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/vboxnetflt
+%config(noreplace) %verify(not md5 mtime size)
/etc/modules-load.d/vboxnetflt.conf
+%{systemdunitdir}/vboxnetflt.service
/lib/modules/%{_kernel_ver}/misc/vboxnetflt.ko*
%files -n kernel%{_alt_kernel}-misc-vboxpci
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/vboxpci
+%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxpci.conf
+%{systemdunitdir}/vboxpci.service
/lib/modules/%{_kernel_ver}/misc/vboxpci.ko*
%files -n kernel%{_alt_kernel}-misc-vboxsf
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/vboxsf
+%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/vboxsf.conf
+%{systemdunitdir}/vboxsf.service
%attr(755,root,root) %{_sbindir}/mount.vboxsf
/lib/modules/%{_kernel_ver}/misc/vboxsf.ko*
@@ -951,6 +984,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.416 2012/02/14 18:32:47 baggins
+- systemd support in the form of kernel loader configs,
+ and masked kernel-loading services - let systemd handle it
+
Revision 1.415 2012/02/14 18:07:36 arekm
- release 12
================================================================
Index: packages/VirtualBox/VirtualBox-vboxdrv-modules-load.conf
diff -u /dev/null packages/VirtualBox/VirtualBox-vboxdrv-modules-load.conf:1.1
--- /dev/null Tue Feb 14 19:32:53 2012
+++ packages/VirtualBox/VirtualBox-vboxdrv-modules-load.conf Tue Feb 14
19:32:47 2012
@@ -0,0 +1 @@
+vboxdrv
================================================================
Index: packages/VirtualBox/VirtualBox-vboxguest-modules-load.conf
diff -u /dev/null packages/VirtualBox/VirtualBox-vboxguest-modules-load.conf:1.1
--- /dev/null Tue Feb 14 19:32:53 2012
+++ packages/VirtualBox/VirtualBox-vboxguest-modules-load.conf Tue Feb 14
19:32:47 2012
@@ -0,0 +1 @@
+vboxguest
================================================================
Index: packages/VirtualBox/VirtualBox-vboxnetadp-modules-load.conf
diff -u /dev/null
packages/VirtualBox/VirtualBox-vboxnetadp-modules-load.conf:1.1
--- /dev/null Tue Feb 14 19:32:53 2012
+++ packages/VirtualBox/VirtualBox-vboxnetadp-modules-load.conf Tue Feb 14
19:32:47 2012
@@ -0,0 +1 @@
+vboxnetadp
================================================================
Index: packages/VirtualBox/VirtualBox-vboxnetflt-modules-load.conf
diff -u /dev/null
packages/VirtualBox/VirtualBox-vboxnetflt-modules-load.conf:1.1
--- /dev/null Tue Feb 14 19:32:53 2012
+++ packages/VirtualBox/VirtualBox-vboxnetflt-modules-load.conf Tue Feb 14
19:32:47 2012
@@ -0,0 +1 @@
+vboxnetflt
================================================================
Index: packages/VirtualBox/VirtualBox-vboxpci-modules-load.conf
diff -u /dev/null packages/VirtualBox/VirtualBox-vboxpci-modules-load.conf:1.1
--- /dev/null Tue Feb 14 19:32:53 2012
+++ packages/VirtualBox/VirtualBox-vboxpci-modules-load.conf Tue Feb 14
19:32:47 2012
@@ -0,0 +1 @@
+vboxpci
================================================================
Index: packages/VirtualBox/VirtualBox-vboxsf-modules-load.conf
diff -u /dev/null packages/VirtualBox/VirtualBox-vboxsf-modules-load.conf:1.1
--- /dev/null Tue Feb 14 19:32:53 2012
+++ packages/VirtualBox/VirtualBox-vboxsf-modules-load.conf Tue Feb 14
19:32:47 2012
@@ -0,0 +1 @@
+vboxsf
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.415&r2=1.416&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
