From: Jan Palus <atler@pld-linux.org>
Date: Sun, 31 Mar 2019 17:08:52 +0000 (+0200)
Subject: fix vbox devices permissions in guest
X-Git-Tag: auto/th/VirtualBox-6.0.4-3~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2FVirtualBox.git;a=commitdiff_plain;h=b1e693b80f530bf1d2b730f3462dee445618008a

fix vbox devices permissions in guest
---

diff --git a/VirtualBox.spec b/VirtualBox.spec
index 636ec5f..804f7c8 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -65,6 +65,7 @@ Source8:	%{pname}-virtualbox-guest-modules-load.conf
 Source9:	vboxautostart.init
 Source10:	autostart.cfg
 Source11:	vboxclient-vmsvga.service
+Source12:	udev-guest.rules
 Patch0:		%{pname}-version-error.patch
 Patch1:		%{pname}-VBoxSysInfo.patch
 Patch2:		%{pname}-warning_workaround.patch
@@ -786,6 +787,7 @@ rm -r $RPM_BUILD_ROOT%{_libdir}/%{pname}/icons
 
 %{__mv} $RPM_BUILD_ROOT{%{_libdir}/%{pname},/lib/udev}/VBoxCreateUSBNode.sh
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/udev/rules.d/60-vboxdrv.rules
+cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/udev/rules.d/60-vboxguest.rules
 
 %if %{with dkms}
 mv $RPM_BUILD_ROOT%{_libdir}/%{pname}/src $RPM_BUILD_ROOT%{_usrsrc}/vboxhost-%{version}-%{rel}
@@ -877,6 +879,7 @@ fi
 %update_mime_database
 
 %pre guest
+%useradd -u 336 -d /usr/share/empty -s /bin/false -c "VirtualBox guest additions" -g nobody vboxadd
 # Add a group "vboxsf" for Shared Folders access
 # All users which want to access the auto-mounted Shared Folders have to be added to this group.
 %groupadd -g 266 -r -f vboxsf
@@ -895,6 +898,7 @@ fi
 
 %postun guest
 if [ "$1" = "0" ]; then
+	%userremove vboxadd
 	%groupremove vboxsf
 fi
 %systemd_reload
@@ -1053,7 +1057,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 
 %dir %{_datadir}/%{pname}
 
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/*.rules
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/60-vboxdrv.rules
 %attr(755,root,root) /lib/udev/VBoxCreateUSBNode.sh
 
 %if %{with gui}
@@ -1122,6 +1126,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 %{systemdunitdir}/vboxclient-vmsvga.service
 %attr(755,root,root) %{_bindir}/VBoxControl
 %attr(755,root,root) %{_bindir}/VBoxService
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/60-vboxguest.rules
 
 %files guest-x11
 %defattr(644,root,root,755)
diff --git a/udev-guest.rules b/udev-guest.rules
new file mode 100644
index 0000000..1525701
--- /dev/null
+++ b/udev-guest.rules
@@ -0,0 +1,3 @@
+# Devices in Guest, should use acl really
+KERNEL=="vboxguest",  OWNER="vboxadd", MODE="0660"
+KERNEL=="vboxuser",   OWNER="vboxadd", MODE="0666"
diff --git a/udev.rules b/udev.rules
index 5cf25b2..3bee4e6 100644
--- a/udev.rules
+++ b/udev.rules
@@ -14,7 +14,3 @@ SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSB
 
 SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="VBoxCreateUSBNode.sh --remove $major $minor"
 SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh --remove $major $minor"
-
-# Devices in Guest, should use acl really
-KERNEL=="vboxguest",  GROUP="vbox", MODE="0600"
-KERNEL=="vboxuser",   GROUP="vbox", MODE="0666"