--- rpms/smeserver-virtualbox/contribs10/smeserver-virtualbox.spec	2022/10/18 09:25:29	1.3
+++ rpms/smeserver-virtualbox/contribs10/smeserver-virtualbox.spec	2022/10/19 02:12:56	1.4
@@ -1,6 +1,6 @@
 %define name smeserver-virtualbox
 %define version 5.2
-%define release 1
+%define release 2
 %define rpmver 5.2
 Summary: smserver rpm to install VirtualBox
 Name: %{name}
@@ -19,11 +19,15 @@ Requires: VirtualBox-5.2
 Requires: kernel-devel
 Requires: gcc
 AutoReqProv: no
+Patch0: smeserver-virtualbox-5.2-move_vbox_dir.patch
 
 %description
 smserver rpm to install VirtualBox-5.2
 
 %changelog
+* Wed Oct 19 2022 Trevor Batley <trevor@batley.id.au> 5.2-2.sme
+- change vbox user to system user and change the home directory
+
 * Tue Oct 11 2022 Trevor Batley <trevor@batley.id.au> 5.2-1.sme
 - first import to sme10
 - requires VirtualBox-5.2
@@ -54,6 +58,7 @@ smserver rpm to install VirtualBox-5.2
 %prep
 
 %setup
+%patch0 -p1
 
 %build
 perl createlinks
@@ -70,19 +75,18 @@ cd ..
 rm -rf %{name}-%{version}
 
 %pre
-/usr/lib/virtualbox/vboxdrv.sh stop >/dev/null 2>&1
+/sbin/e-smith/systemctl stop vboxdrv >/dev/null 2>&1
 if /sbin/e-smith/db accounts get vbox >/dev/null
 then
     echo "the vbox user already exists - we'll use this"
 else
-    /sbin/e-smith/db accounts set vbox user PasswordSet yes
-    /sbin/e-smith/signal-event user-create vbox
-    usermod -s /bin/bash vbox
-    /sbin/e-smith/db accounts set vboxusers group Description "VBox users" Members "admin,vbox"
+    /sbin/e-smith/db accounts set vboxusers group Description "VBox users" Members "admin"
     /sbin/e-smith/signal-event group-create vboxusers
-    mkdir /home/e-smith/files/users/vbox/.virtualbox
-    cat /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c 32 > /home/e-smith/files/users/vbox/.virtualbox/vbox.passwd
-    cat /home/e-smith/files/users/vbox/.virtualbox/vbox.passwd  | passwd --stdin vbox
+    /sbin/e-smith/db accounts set vbox system Description "VBox runtime user"
+    useradd -c "VBox runtime user" -d /home/vbox -m -N -s /bin/bash -g vboxusers vbox
+    mkdir /home/vbox/.virtualbox
+    cat /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c 32 > /home/vbox/.virtualbox/vbox.passwd
+    cat /home/vbox/.virtualbox/vbox.passwd  | passwd --stdin vbox
 fi
 
 %preun
@@ -90,8 +94,8 @@ fi
 /sbin/e-smith/systemctl stop vboxdrv
 
 %post
-/usr/lib/virtualbox/vboxdrv.sh start >/dev/null 2>&1
-/usr/bin/vboxmanage setproperty websrvauthlibrary null
+/sbin/e-smith/systemctl start vboxdrv
+su vbox -c "/usr/bin/vboxmanage setproperty websrvauthlibrary null"
 
 %postun
 #uninstall