Hello community,
here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2019-01-08 12:19:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virtualbox (Old)
and /work/SRC/openSUSE:Factory/.virtualbox.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox"
Tue Jan 8 12:19:21 2019 rev:171 rq:662944 version:5.2.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2018-12-03 10:05:59.587951751 +0100
+++ /work/SRC/openSUSE:Factory/.virtualbox.new.28833/virtualbox.changes 2019-01-08 12:19:23.628872259 +0100
@@ -1,0 +2,31 @@
+Sat Dec 8 18:10:09 UTC 2018 - Hans-Peter Jansen
+
+- proper permissions for /etc/vbox/*.cfg
+
+-------------------------------------------------------------------
+Sat Dec 8 14:17:50 UTC 2018 - Hans-Peter Jansen
+
+- remove ambiguous labels in vboxdrv: fixes restart and such
+- make autostarting synchronous again
+- improve README.autostart
+- add new autostart variables to the existing /etc/default/virtualbox
+ in %post, if missing
+
+-------------------------------------------------------------------
+Wed Dec 5 12:10:20 UTC 2018 - Hans-Peter Jansen
+
+- replace switch_to_python3.6.patch with switch_to_python3.4+.patch
+
+-------------------------------------------------------------------
+Tue Dec 4 21:43:02 UTC 2018 - Hans-Peter Jansen
+
+- remove fixes_for_leap15.patch, upstream has incorporated it
+- add conflict with i4l-vbox due to shared /etc/vbox
+- adjust /etc/vbox permissions
+- add /etc/vbox/autostart.cfg
+- fix vboxdrv.sh: apply new autostart mechanics to stop_vms()
+- remove obsolete shutdown section in /etc/default/virtualbox
+- add VBOXAUTOSTART_{DB,CONFIG} to /etc/default/virtualbox
+- supply README.autostart
+
+-------------------------------------------------------------------
Old:
----
fixes_for_leap15.patch
switch_to_python3.6.patch
New:
----
README.autostart
switch_to_python3.4+.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox.spec ++++++
--- /var/tmp/diff_new_pack.tTrNOM/_old 2019-01-08 12:19:25.588870083 +0100
+++ /var/tmp/diff_new_pack.tTrNOM/_new 2019-01-08 12:19:25.588870083 +0100
@@ -1,7 +1,7 @@
#
# spec file for package virtualbox
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -68,6 +68,7 @@
Source17: vboxguestconfig.sh
Source18: fix_usb_rules.sh
Source19: vboxdrv.sh
+Source20: README.autostart
Source98: %{name}-rpmlintrc
Source99: %{name}-patch-source.sh
#rework init scripts to fit suse needs
@@ -117,16 +118,14 @@
Patch116: Fix_for_server_1.19.patch
# Fix invalid use of internal headers
Patch118: internal-headers.patch
-# Fix kernel API change in Leap 15
-Patch119: fixes_for_leap15.patch
# Fix rpmlint error for script /lib/usr/virtualbox/vboxshell.py
Patch120: fixes_for_python.patch
# Remove vboxvideo from build
Patch121: remove_vbox_video_build.patch
# Fix build for Qt 5.11
Patch122: fixes_for_Qt5.11.patch
-# Switch to Python 3.6
-Patch123: switch_to_python3.6.patch
+# Switch to Python 3.4+
+Patch123: switch_to_python3.4+.patch
Patch124: fix_32_bit_builds.patch
# Fix API changes for kernel 4.20+
Patch125: fixes_for_4.20.patch
@@ -229,6 +228,10 @@
BuildRequires: xorg-x11-libXt-devel-32bit
%endif
%{?systemd_requires}
+# package i4l-vbox from source package i4l-base shares the directory /etc/vbox
+# with us, but with different owner.
+Conflicts: i4l-vbox
+
%posttrans
%description
@@ -427,9 +430,6 @@
%patch115 -p1
%patch116 -p1
%patch118 -p1
-%if 0%{suse_version} == 1500
-%patch119 -p1
-%endif
%patch120 -p1
%patch121 -p1
%patch122 -p1
@@ -442,6 +442,8 @@
cp %{SOURCE1} UserManual.pdf
#copy kbuild config
cp %{SOURCE10} LocalConfig.kmk
+#copy autostart doc
+cp %{SOURCE20} README.autostart
#
##########################
####workaround kmk_sed --v
@@ -690,6 +692,7 @@
# Service files to load kernel modules on boot
install -m 0644 %{SOURCE14} %{buildroot}%{_unitdir}/vboxdrv.service
+ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rcvboxdrv
install -m 0644 %{SOURCE15} %{buildroot}%{_unitdir}/vboxadd-service.service
install -m 0755 %{SOURCE16} %{buildroot}/sbin/vboxconfig
install -m 0755 %{SOURCE17} %{buildroot}/sbin/vboxguestconfig
@@ -703,6 +706,14 @@
# config file for vboxdrv script and vboxweb
install -d -m 755 %{buildroot}%{_sysconfdir}/vbox
echo -e "#settings for vboxwebsrn\nVBOXWEB_USER=root" > %{buildroot}%{_sysconfdir}/vbox/vbox.cfg
+cat > %{buildroot}%{_sysconfdir}/vbox/autostart.cfg << EOF
+default_policy = deny
+# Create an entry for each user allowed to use autostart
+myusername = {
+allow = true
+}
+
+EOF
# install udev helper script for creating usb devices
install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh %{buildroot}%{_vbox_instdir}/VBoxCreateUSBNode.sh
######################################################
@@ -789,6 +800,18 @@
%set_permissions %{_vbox_instdir}/VBoxNetAdpCtl
%set_permissions %{_vbox_instdir}/VBoxHeadless
%service_add_post vboxdrv.service
+# add new autostart stuff to the existing default config, if missing
+grep -q VBOXAUTOSTART /etc/default/virtualbox || {
+ cat >> /etc/default/virtualbox << EOF
+#
+# -------------------------------------------------------------------------------------------------
+# Autostart
+# -------------------------------------------------------------------------------------------------
+VBOXAUTOSTART_DB=/etc/vbox
+VBOXAUTOSTART_CONFIG=/etc/vbox/autostart.cfg
+
+EOF
+}
%post qt
%set_permissions %{_vbox_instdir}/VirtualBox
@@ -859,7 +882,7 @@
%files
%defattr(-, root, root)
-%doc UserManual.pdf
+%doc README.autostart UserManual.pdf
%{_bindir}/VBoxManage
%{_bindir}/VBoxHeadless
%{_bindir}/VBoxTunctl
@@ -916,15 +939,17 @@
/usr/lib/virtualbox/vboxdrv.sh
%{_unitdir}/vboxdrv.service
%{_unitdir}/multi-user.target.wants/vboxdrv.service
-%dir %{_sysconfdir}/vbox
-##%attr(1775,root,vboxusers) %{_sysconfdir}/vbox
-%config %{_sysconfdir}/vbox/vbox.cfg
+%{_sbindir}/rcvboxdrv
/sbin/vboxconfig
%{_vbox_instdir}/VBoxCreateUSBNode.sh
%verify(not mode) %attr(0755,root,vboxusers) %{_vbox_instdir}/VBoxNetNAT
%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP
%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetAdpCtl
%verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxHeadless
+%dir %{_sysconfdir}/vbox
+%attr(1775,root,vboxusers) %{_sysconfdir}/vbox
+%config %attr(644,root,vboxusers) %{_sysconfdir}/vbox/vbox.cfg
+%config %attr(644,root,vboxusers) %{_sysconfdir}/vbox/autostart.cfg
%files qt
%defattr(-, root, root)
++++++ README.autostart ++++++
Prerequisites
=============
Users, that want to use the VirtualBox autostart feature, have to be
members of the vboxusers group.
E.g.:
sudo usermod -aG vboxusers USERNAME
Preparation
===========
For each autostart user, add a section in /etc/vbox/autostart.cfg:
USERNAME = {
allow = true
}
Users work
==========
The *first* time a user configures autostart, the command:
VBoxManage setproperty autostartdbpath /etc/vbox
needs to be run.
Note: The autostart options are stored in the /etc/vbox file, and in the
VM itself. If moving a VM, these options may need to be set again.
Prepare a VM to start automatically:
VBoxManage modifyvm --autostart-enabled
Choose a shut down mode:
VBoxManage modifyvm --autostop-type
Restart the vboxdrv service to start the VMs in question
sudo service vboxdrv restart
++++++ switch_to_python3.4+.patch ++++++
Index: b/configure
===================================================================
--- a/configure
+++ b/configure
@@ -1963,17 +1963,17 @@ extern "C" int main(void)
{
Py_Initialize();
printf("found version %s", PY_VERSION);
-#if PY_VERSION_HEX >= 0x02060000
+#if PY_VERSION_HEX >= 0x03040000
printf(", OK.\n");
return 0;
#else
- printf(", expected version 2.6 or higher\n");
+ printf(", expected version 3.4 or higher\n");
return 1;
#endif
}
EOF
found=
- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m"
+ SUPPYTHONLIBS="python3.4 python3.4m python3.5 python3.5m python3.6m python3.6 python3.7m python3.7"
for p in $PYTHONDIR; do
for d in $SUPPYTHONLIBS; do
for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
Index: b/src/VBox/Installer/linux/routines.sh
===================================================================
--- a/src/VBox/Installer/linux/routines.sh
+++ b/src/VBox/Installer/linux/routines.sh
@@ -375,8 +375,8 @@ terminate_proc() {
maybe_run_python_bindings_installer() {
VBOX_INSTALL_PATH="${1}"
- PYTHON=python
- if [ "`python -c 'import sys
+ PYTHON=python3
+ if [ "`python3 -c 'import sys
if sys.version_info >= (2, 6):
print \"test\"' 2> /dev/null`" != "test" ]; then
echo 1>&2 "Python 2.6 or later not available, skipping bindings installation."
Index: b/src/bldprogs/scm.cpp
===================================================================
--- a/src/bldprogs/scm.cpp
+++ b/src/bldprogs/scm.cpp
@@ -2033,7 +2033,7 @@ static int scmProcessFileInner(PSCMRWSTA
pszTreatAs = "shell";
else if ( (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0)
|| (cchFirst >= 19 && strncmp(pchFirst, "/usr/bin/env python", 19) == 0) )
- pszTreatAs = "python";
+ pszTreatAs = "python3";
else if ( (cchFirst >= 13 && strncmp(pchFirst, "/usr/bin/perl", 13) == 0)
|| (cchFirst >= 17 && strncmp(pchFirst, "/usr/bin/env perl", 17) == 0) )
pszTreatAs = "perl";
Index: b/src/libs/libxml2-2.9.4/configure
===================================================================
--- a/src/libs/libxml2-2.9.4/configure
+++ b/src/libs/libxml2-2.9.4/configure
@@ -15153,10 +15153,10 @@ PYTHON_SITE_PACKAGES=
PYTHON_TESTS=
pythondir=
if test "$with_python" != "no" ; then
- if test -x "$with_python/bin/python"
+ if test -x "$with_python/bin/python3"
then
- echo Found python in $with_python/bin/python
- PYTHON="$with_python/bin/python"
+ echo Found python in $with_python/bin/python3
+ PYTHON="$with_python/bin/python3"
else
if test -x "$with_python/python.exe"
then
@@ -15174,7 +15174,8 @@ if test "$with_python" != "no" ; then
with_python=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
else
# Extract the first word of "python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5", so it can be a program name with args.
-set dummy python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5; ac_word=$2
+PYTHON=python3
+set dummy python3 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PYTHON+:} false; then :
Index: b/src/VBox/ValidationKit/testboxscript/setup.sh
===================================================================
--- a/src/VBox/ValidationKit/testboxscript/setup.sh
+++ b/src/VBox/ValidationKit/testboxscript/setup.sh
@@ -644,7 +644,7 @@ import sys;\
x = sys.version_info[0] == 2 and (sys.version_info[1] >= 6 or (sys.version_info[1] == 5 and sys.version_info[2] >= 1));\
sys.exit(not x);\
";
- for python in python2.7 python2.6 python2.5 python;
+ for python in python3.6 python2.7 python2.6 python2.5 python;
do
python=`which ${python} 2> /dev/null`
if [ -n "${python}" -a -x "${python}" ]; then
Index: b/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
===================================================================
--- a/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+++ b/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
@@ -20,7 +20,7 @@
%define %PYTHON% 1
%define VBOXDOCDIR %{_defaultdocdir}/%NAME%
%global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %define python_sitelib python3 -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Summary: Oracle VM VirtualBox
Name: %NAME%
@@ -82,7 +82,7 @@ install -m 755 -d $RPM_BUILD_ROOT/usr/sh
%if %{?with_python:1}%{!?with_python:0}
(export VBOX_INSTALL_PATH=/usr/lib/virtualbox && \
cd ./sdk/installer && \
- %{__python} ./vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT)
+ %{python3} ./vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT)
%endif
rm -rf sdk/installer
mv nls $RPM_BUILD_ROOT/usr/share/virtualbox
Index: b/src/libs/libxml2-2.9.4/libxml.spec.in
===================================================================
--- a/src/libs/libxml2-2.9.4/libxml.spec.in
+++ b/src/libs/libxml2-2.9.4/libxml.spec.in
@@ -101,11 +101,11 @@ rm -fr %{buildroot}
make install DESTDIR=%{buildroot}
-%if 0%{?with_python3}
+%if 0%{?with_python}
make clean
-%configure --with-python=%{__python3}
+%configure --with-python=python3
make install DESTDIR=%{buildroot}
-%endif # with_python3
+%endif # with_python
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
Index: b/src/libs/libxml2-2.9.4/libxml2.spec
===================================================================
--- a/src/libs/libxml2-2.9.4/libxml2.spec
+++ b/src/libs/libxml2-2.9.4/libxml2.spec
@@ -103,7 +103,7 @@ make install DESTDIR=%{buildroot}
%if 0%{?with_python3}
make clean
-%configure --with-python=%{__python3}
+%configure --with-python=python3
make install DESTDIR=%{buildroot}
%endif # with_python3
Index: b/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
===================================================================
--- a/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+++ b/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
@@ -439,8 +439,10 @@ char *PyTraceback_AsString(PyObject *exc
{ // a temp scope so I can use temp locals.
#if PY_MAJOR_VERSION <= 2
char *tempResult = PyString_AsString(obResult);
-#else
+#elif PY_MINOR_VERSION <= 6
char *tempResult = PyUnicode_AsUTF8(obResult);
+#else
+ const char *tempResult = PyUnicode_AsUTF8(obResult);
#endif
result = (char *)PyMem_Malloc(strlen(tempResult)+1);
if (result==NULL)
Index: b/src/libs/xpcom18a4/python/src/PyGBase.cpp
===================================================================
--- a/src/libs/xpcom18a4/python/src/PyGBase.cpp
+++ b/src/libs/xpcom18a4/python/src/PyGBase.cpp
@@ -183,7 +183,11 @@ PyG_Base::~PyG_Base()
// Get the correct interface pointer for this object given the IID.
void *PyG_Base::ThisAsIID( const nsIID &iid )
{
- if (this==NULL) return NULL;
+#if PY_MINOR_VERSION <= 6
+ if (!this) return NULL;
+#else
+ if (!this) return NULL;
+#endif
if (iid.Equals(NS_GET_IID(nsISupports)))
return (nsISupports *)(nsIInternalPython *)this;
if (iid.Equals(NS_GET_IID(nsISupportsWeakReference)))
++++++ vboxdrv.sh ++++++
--- /var/tmp/diff_new_pack.tTrNOM/_old 2019-01-08 12:19:25.752869902 +0100
+++ /var/tmp/diff_new_pack.tTrNOM/_new 2019-01-08 12:19:25.756869897 +0100
@@ -210,7 +210,7 @@
rm -rf /dev/vboxusb
}
-start()
+start_drv()
{
begin_msg "Starting VirtualBox services" console
if [ -d /proc/xen ]; then
@@ -267,7 +267,7 @@
succ_msg "VirtualBox services started"
}
-stop()
+stop_drv()
{
begin_msg "Stopping VirtualBox services" console
@@ -297,51 +297,29 @@
succ_msg "VirtualBox services stopped"
}
-# enter the following variables in /etc/default/virtualbox:
-# SHUTDOWN_USERS="foo bar"
-# check for running VMs of user foo and user bar
-# SHUTDOWN=poweroff
-# SHUTDOWN=acpibutton
-# SHUTDOWN=savestate
-# select one of these shutdown methods for running VMs
stop_vms()
{
- wait=0
- for i in $SHUTDOWN_USERS; do
- # don't create the ipcd directory with wrong permissions!
- if [ -d /tmp/.vbox-$i-ipc ]; then
- export VBOX_IPC_SOCKETID="$i"
- VMS=`$VBOXMANAGE --nologo list runningvms | sed -e 's/^".*".*{\(.*\)}/\1/' 2>/dev/null`
- if [ -n "$VMS" ]; then
- if [ "$SHUTDOWN" = "poweroff" ]; then
- begin_msg "Powering off remaining VMs"
- for v in $VMS; do
- $VBOXMANAGE --nologo controlvm $v poweroff
- done
- succ_msg "Remaining VMs powered off"
- elif [ "$SHUTDOWN" = "acpibutton" ]; then
- begin_msg "Sending ACPI power button event to remaining VMs"
- for v in $VMS; do
- $VBOXMANAGE --nologo controlvm $v acpipowerbutton
- wait=30
- done
- succ_msg "ACPI power button event sent to remaining VMs"
- elif [ "$SHUTDOWN" = "savestate" ]; then
- begin_msg "Saving state of remaining VMs"
- for v in $VMS; do
- $VBOXMANAGE --nologo controlvm $v savestate
- done
- succ_msg "State of remaining VMs saved"
- fi
- fi
- fi
- done
- # wait for some seconds when doing ACPI shutdown
- if [ "$wait" -ne 0 ]; then
- begin_msg "Waiting for $wait seconds for VM shutdown"
- sleep $wait
- succ_msg "Waited for $wait seconds for VM shutdown"
- fi
+OLD_IFS=$IFS
+IFS=$'\n'
+# read config file
+[ -r /etc/default/virtualbox ] && . /etc/default/virtualbox
+[ -z "$VBOXAUTOSTART_DB" ] && return
+[ -z "$VBOXAUTOSTART_CONFIG" ] && return
+# read autostart config file
+if [ -r $VBOXAUTOSTART_CONFIG ]; then
+# find all the files of type username.stop
+ var=$(ls $VBOXAUTOSTART_DB | grep stop | grep -v auto)
+# process each file of that type
+ for i in $var; do
+# Extract the user name - the first word on the line
+ user=$(echo $i | head -n1 | cut -d "." -f1)
+# autostop the VMs for that user
+ begin_msg "Stopping VMs for user $user" console
+ su - $user -c "/usr/lib/virtualbox/VBoxAutostart --stop --config $VBOXAUTOSTART_CONFIG"
+ succ_msg "VMs for user $user stopped"
+ done
+fi
+IFS=$OLD_IFS
}
start_vms()
@@ -350,25 +328,26 @@
IFS=$'\n'
# read config file
[ -r /etc/default/virtualbox ] && . /etc/default/virtualbox
-#echo "Symbols are $VBOXAUTOSTART_DB and $VBOXAUTOSTART_CONFIG"
+[ -z "$VBOXAUTOSTART_DB" ] && return
+[ -z "$VBOXAUTOSTART_CONFIG" ] && return
# read autostart config file
if [ -r $VBOXAUTOSTART_CONFIG ]; then
- VBoxManage list vms
-# find all the files of type user.start
+# find all the files of type username.start
var=$(ls $VBOXAUTOSTART_DB | grep start | grep -v auto)
# process each file of that type
for i in $var; do
# Extract the user name - the first word on the line
user=$(echo $i | head -n1 | cut -d "." -f1)
# autostart the VMs for that user
- su $user -c "/usr/lib/virtualbox/VBoxAutostart --start --config $VBOXAUTOSTART_CONFIG"
+ begin_msg "Starting VMs for user $user" console
+ su - $user -c "/usr/lib/virtualbox/VBoxAutostart --start --config $VBOXAUTOSTART_CONFIG"
+ succ_msg "VMs for user $user started"
done
fi
IFS=$OLD_IFS
-
}
-cleanup()
+cleanup_vb()
{
for i in /lib/modules/*; do
# We could just do "rm -f", but we only want to try deleting folders if
@@ -390,7 +369,7 @@
}
# setup_script
-setup()
+setup_vb()
{
# Try to build the host kernel modules in case prepackaging has failed
/sbin/vboxconfig
@@ -430,18 +409,18 @@
case "$1" in
start)
- start
+ start_drv
start_vms
;;
stop)
stop_vms
- stop
+ stop_drv
;;
stop_vms)
stop_vms
;;
restart)
- stop && start
+ "$0" stop && "$0" start
;;
setup)
# Create udev rule and USB device nodes.
@@ -450,17 +429,17 @@
## todo Do we need a udev rule to create /dev/vboxdrv[u] at all? We have
## working fall-back code here anyway, and the "right" code is more complex
## than the fall-back. Unnecessary duplication?
- stop && cleanup
+ stop_drv && cleanup_vb
setup_usb "$GROUP" "$DEVICE_MODE" "$INSTALL_DIR"
- setup && start
+ setup_vb && start_drv
;;
cleanup)
- stop && cleanup
+ stop_drv && cleanup_vb
cleanup_usb
;;
force-reload)
- stop
- start
+ "$0" stop
+ "$0" start
;;
status)
dmnstatus
++++++ virtualbox-default.virtualbox ++++++
--- /var/tmp/diff_new_pack.tTrNOM/_old 2019-01-08 12:19:25.796869853 +0100
+++ /var/tmp/diff_new_pack.tTrNOM/_new 2019-01-08 12:19:25.800869848 +0100
@@ -1,19 +1,10 @@
# /etc/default/virtualbox
#
# -------------------------------------------------------------------------------------------------
-# In the "SHUTDOWN_USERS" list all users for which a check for runnings VMs should be done during
-# shutdown of "vboxdrv" resp. the server:
-# SHUTDOWN_USERS="foo bar"
-#
-# Set "SHUTDOWN" to one of "poweroff", "acpibutton" or "savestate" depending on which of the
-# shutdown methods for running VMs are wanted:
-# SHUTDOWN="poweroff"
-# SHUTDOWN="acpibutton"
-# SHUTDOWN="savestate"
+# Autostart
# -------------------------------------------------------------------------------------------------
-#
-#SHUTDOWN_USERS="foo bar"
-#SHUTDOWN="savestate"
+VBOXAUTOSTART_DB=/etc/vbox
+VBOXAUTOSTART_CONFIG=/etc/vbox/autostart.cfg
# -------------------------------------------------------------------------------------------------
# By default, vboxdrv creates a file /etc/udev/rules.d/60-vboxdrv.rules every time, it is started,