Accepting request 328398 from home:wolfi323:branches:Virtualization

- Install and enable the vboxadd-service init script, to make auto-mounting of shared folders and time synchronization work
- Install VBoxService to /usr/sbin/ instead of /usr/bin/ so that vboxadd-service can find it, it cannot be run as user anyway
- Create the /media folder with appropriate permissions on distributions higher than 13.1, it doesn't exist any more and the one that VBoxService creates automatically cannot be accessed by normal users
- Fixes boo#908669 and boo#936254

OBS-URL: https://build.opensuse.org/request/show/328398
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=221
This commit is contained in:
Larry Finger 2015-09-01 23:16:44 +00:00 committed by Git OBS Bridge
parent 87fc2fecaa
commit a0b0824e1f
2 changed files with 29 additions and 2 deletions

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Sep 1 15:03:14 UTC 2015 - wbauer@tmo.at
- Install and enable the vboxadd-service init script, to make
auto-mounting of shared folders and time synchronization work
- Install VBoxService to /usr/sbin/ instead of /usr/bin/ so that
vboxadd-service can find it, it cannot be run as user anyway
- Create the /media folder with appropriate permissions on
distributions higher than 13.1, it doesn't exist any more and the
one that VBoxService creates automatically cannot be accessed by
normal users
- Fixes boo#908669 and boo#936254
-------------------------------------------------------------------
Fri Aug 14 13:23:25 UTC 2015 - Larry.Finger@lwfinger.net

View File

@ -445,12 +445,18 @@ done
echo "entering guest-tools install section"
###########################################
install -m 755 out/linux.*/release/bin/additions/VBoxControl %{buildroot}%{_bindir}/VBoxControl
install -m 755 out/linux.*/release/bin/additions/VBoxService %{buildroot}%{_bindir}/VBoxService
install -m 755 out/linux.*/release/bin/additions/VBoxService %{buildroot}%{_sbindir}/VBoxService
install -m 755 out/linux.*/release/bin/additions/mount.vboxsf %{buildroot}/sbin/mount.vboxsf
install -m 744 src/VBox/Additions/linux/installer/vboxadd.sh %{buildroot}%{_sysconfdir}/init.d/vboxadd
install -m 744 src/VBox/Additions/linux/installer/vboxadd-service.sh %{buildroot}%{_sysconfdir}/init.d/vboxadd-service
ln -s %{_sysconfdir}/init.d/vboxadd %{buildroot}%{_sbindir}/rcvboxadd
ln -s %{_sysconfdir}/init.d/vboxadd-service %{buildroot}%{_sbindir}/rcvboxadd-service
# udev rule for guest (virtualbox-guest-tools)
install -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules
# /media is used for auto-mounting of shared folders
%if 0%{?suse_version} > 1310
install -d 755 %{buildroot}/media
%endif
#
##############################################################
echo "entering guest-x11 install section"
@ -641,6 +647,7 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf
%post guest-tools
%fillup_and_insserv -f -y vboxadd
%fillup_and_insserv -f -y vboxadd-service
%post websrv
%fillup_and_insserv -f -y vboxweb-service
@ -653,6 +660,7 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf
exit 0
%preun guest-tools
%stop_on_removal vboxadd-service
%stop_on_removal vboxadd
exit 0
@ -671,6 +679,7 @@ exit 0
%postun guest-tools
%restart_on_update vboxadd
%restart_on_update vboxadd-service
%insserv_cleanup
%postun websrv
@ -781,11 +790,16 @@ exit 0
%files guest-tools
%defattr(-, root, root)
%{_bindir}/VBoxControl
%{_bindir}/VBoxService
%{_sbindir}/VBoxService
/sbin/mount.vboxsf
%{_udevrulesdir}/60-vboxguest.rules
%config %{_sysconfdir}/init.d/vboxadd
%config %{_sysconfdir}/init.d/vboxadd-service
%{_sbindir}/rcvboxadd
%{_sbindir}/rcvboxadd-service
%if 0%{?suse_version} > 1310
%dir /media
%endif
%files -n python-%{name} -f %{_tmppath}/SITE_FILES
%defattr(-, root, root)