From nobody Tue Jul 09 21:31:32 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WJZ1c4CBhz5R7Xx; Tue, 09 Jul 2024 21:31:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WJZ1c3mx8z52Zj; Tue, 9 Jul 2024 21:31:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720560692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WhwlbowWu1/Sc71lupbZVA/Movs/i2yByLm4I6OLQWY=; b=jiC4TtDe7wiY0US/LxPxFyFZxjhmzUJs20mBsEHer3Pj2aDPWtGMjsMOkOm99v5slzNOUy BdZFgJaM26G+5tEvIG+LlncSNH1eS/ErXv1hfYYz6JkqQeg4YgLa6aZ6g9HVNF7XrkH7J4 l/IsA3lIssbRVEfmfn75zXNDU/g86PBVKghjrP6R5N20arOxeJiA9BKyMVq+Qb72aKZ+K7 rL0/QSQ/ZJg5aht0nWdVHKR03spXvCv/f+3ReDX2H65F4kCaSg3DYU1NzhqlU8jVk3ZnFQ 8rKqc+MVlchSemRlH8XY8ToxvPJTdfQbwukK5yDUjmvb9vxHSqdrM7uFFp1pjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720560692; a=rsa-sha256; cv=none; b=OXWSA4rl5mME+025wpjILd1aah97H8LsUDiGoeAt1QzioJxxqIeFUN7qzumSvntrGbYe2X 7qrkXz53UT7pSucKjn4uL1gARB14eyEHFKeopElKtS5s4FuRX/8EUh/8FYkm7EMr+ouepy LveZTlXt5kByhfvSFfWoQ6nGrbWWHbkZl46m8EwKXE/ta6ua8ytDmkb/Xa759vH4vueBZ1 LbyMRjyHcMw7uqwNDIEoT9aGW7ST7T3Q2JCgdPYB4ssaIFuFcfZ90CsUNCg7jgZNqZf4n0 1u4pr78hDXoXnnmk3sTqwUQq+quiAZSRmSw9S0LvDkuXnNgle/u+5jKVF2RbTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720560692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WhwlbowWu1/Sc71lupbZVA/Movs/i2yByLm4I6OLQWY=; b=N/lMJhQ5efhvSAlnZGglfQn8QUHG8W5cZcmDX34TI2wPr8xjOO++IpK5zNsljM+dFW0fAM NZe5T+9/hc2qzcyL7CryoNJ4mCgHHwHSi+8elCY5agHUpO5+GyjAzgfGcZzjuUSsG5POIq kMQMAJqCEUhyzmPkqP286ZSH6CJSZFRhlNd2O17LKHSG747bJmVYxb6KTgqi6Y70u7IPz2 f/HhTZYIW7OWWbx7mnxo9cqRtSZ+HZP9iJALgRQBLRNFKTzksO29hQmejJNFuwkMkGSYK/ 5diMsQyIxVoubN+sHexKBscEwO5pB44TFs8eERdiOhlZ/F2C02+krFDFv7XkyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WJZ1c3NXZzqv4; Tue, 9 Jul 2024 21:31:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 469LVWAC074921; Tue, 9 Jul 2024 21:31:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 469LVWb4074918; Tue, 9 Jul 2024 21:31:32 GMT (envelope-from git) Date: Tue, 9 Jul 2024 21:31:32 GMT Message-Id: <202407092131.469LVWb4074918@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: d0deb35b6952 - main - emulators/virtualbox-ose{,-nox11}: add vboxinit start/stop script for VMs which is controlled from phpvirtualbox List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0deb35b6952e0d73c111c6534462dcbd5d77774 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=d0deb35b6952e0d73c111c6534462dcbd5d77774 commit d0deb35b6952e0d73c111c6534462dcbd5d77774 Author: Vladimir Druzenko AuthorDate: 2024-07-09 21:25:25 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-09 21:25:25 +0000 emulators/virtualbox-ose{,-nox11}: add vboxinit start/stop script for VMs which is controlled from phpvirtualbox Set the "Startup Mode" to "Automatic" for the virtual machine in phpvirtualbox to automatically start the virtual machine during OS boot. This script also stops virtual machines during reboot even if vboxinit_enable="YES" is not present in /etc/rc.conf. phpvirtualbox uses the "Web Service" (WEBSERVICE) to configure and manage virtual machines, so we install the script only when the WEBSERVICE option is enabled. PR: 280062 --- emulators/virtualbox-ose-nox11/Makefile | 2 +- emulators/virtualbox-ose/Makefile | 4 +- emulators/virtualbox-ose/files/vboxinit.in | 91 ++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 3 deletions(-) diff --git a/emulators/virtualbox-ose-nox11/Makefile b/emulators/virtualbox-ose-nox11/Makefile index 028c53d1ce91..d2db9016af94 100644 --- a/emulators/virtualbox-ose-nox11/Makefile +++ b/emulators/virtualbox-ose-nox11/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -nox11 OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS PULSEAUDIO \ diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index dfacba9c10a0..93cbd55a9d84 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -1,6 +1,6 @@ PORTNAME= virtualbox-ose PORTVERSION= 6.1.50 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/:src \ LOCAL/bofh/emulators/virtualbox-ose:docs @@ -167,7 +167,7 @@ PLIST_SUB+= QT="@comment " .endif .if ${PORT_OPTIONS:MWEBSERVICE} -USE_RC_SUBR+= vboxwebsrv +USE_RC_SUBR+= vboxinit vboxwebsrv VBOX_LINKS+= vboxwebsrv VBOX_UTILS+= vboxwebsrv webtest .endif diff --git a/emulators/virtualbox-ose/files/vboxinit.in b/emulators/virtualbox-ose/files/vboxinit.in new file mode 100644 index 000000000000..13ec9614827d --- /dev/null +++ b/emulators/virtualbox-ose/files/vboxinit.in @@ -0,0 +1,91 @@ +#!/bin/sh + +# PROVIDE: vboxinit +# REQUIRE: LOGIN vboxnet vboxwebsrv sshd +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf[.local] to enable vboxinit +# +# vboxinit_enable (bool): Set to "NO" by default. +# Set it to "YES" to enable vboxinit. +# stop and faststop are always enabled. +# vboxinit_user (str): Default user account to run with. +# (default: %%VBOXUSER%%) +# vboxinit_home (str): Default home directory to run with. +# (default: home of user ${vboxinit_user} +# vboxinit_stop (str): Default stop cmd for VBoxManage controlvm. +# (default: savestate) +# vboxinit_start_delay (int): Default startup delay in seconds. +# (default: 0) +# vboxinit_stop_delay (int): Default shutdown delay in seconds. +# (default: 0) +# +# Set the "Startup Mode" to "Automatic" for the virtual machine in +# phpvirtualbox to automatically start the virtual machine during OS boot. +# + +. /etc/rc.subr + +name="vboxinit" +rcvar="${name}_enable" + +start_cmd="${name}_start" +stop_cmd="${name}_stop" +status_cmd="${name}_status" +restart_cmd="${name}_restart" + +vboxinit_start() +{ + # Get a list of all machines with autorun enabled in phpvirtualbox + ${su_command} "${command} list vms | /usr/bin/tr -d '{}\"'" | while read VMNAME UUID; do + STARTUP=$(${su_command} "${command} getextradata ${UUID} 'pvbx/startupMode'" | /usr/bin/cut -d' ' -f2) + if [ "${STARTUP}" == "auto" ]; then + echo "${name}: starting machine ${VMNAME} ..." + ${su_command} "${command} startvm ${UUID} --type headless" + sleep "${vboxinit_start_delay}" + fi + done +} + +vboxinit_stop() +{ + # Get all running machines + ${su_command} "${command} list runningvms | /usr/bin/tr -d '{}\"'" | while read VMNAME UUID; do + echo "${name}: stopping machine ${VMNAME} with action '${vboxinit_stop}' ..." + ${su_command} "${command} controlvm ${UUID} ${vboxinit_stop}" + sleep "${vboxinit_stop_delay}" + done +} + +vboxinit_status() +{ + # List all running machines + ${su_command} "${command} list runningvms" +} + +vboxinit_restart() +{ + vboxinit_stop + vboxinit_start +} + +load_rc_config $name + +: ${vboxinit_enable="NO"} +: ${vboxinit_user="%%VBOXUSER%%"} +: ${vboxinit_home=$(/usr/sbin/pw usershow -7 -n "${vboxinit_user}" | /usr/bin/cut -d: -f6)} +: ${vboxinit_stop="savestate"} +: ${vboxinit_start_delay="0"} +: ${vboxinit_stop_delay="0"} +HOME=${vboxinit_home} +USER=${vboxinit_user} +export HOME USER + +command="%%VBOXDIR%%/VBoxManage" +su_command="/usr/bin/su -m ${vboxinit_user} -c" + +if [ "x$1" = "xstop" ] || [ "x$1" = "xfaststop" ]; then + vboxinit_enable="YES" +fi + +run_rc_command "$1"