# HG changeset patch # User Franz Glasner # Date 1724828912 -7200 # Node ID 3f187ec5c4d95043afcf7ea7528537d5f649d423 # Parent c3ad1105c7463912f5e81107df5316d98fa9d491 Extra support for "forcestart" in fbhyve diff -r c3ad1105c746 -r 3f187ec5c4d9 docs/man/man8/fbhyve.rst --- a/docs/man/man8/fbhyve.rst Tue Aug 27 22:33:57 2024 +0200 +++ b/docs/man/man8/fbhyve.rst Wed Aug 28 09:08:32 2024 +0200 @@ -23,6 +23,8 @@ ~~~~~~~~~~~~~~ The extra command ``kill`` is like switching the power off immediately. +It can also be used to cleanup if some spurious artifacts have been left +around that hinder normal starts. The ``stop`` command initiates a clean shutdown by properly terminating :manpage:`bhyve(8)` with `SIGTERM`. diff -r c3ad1105c746 -r 3f187ec5c4d9 files/fbhyve.in --- a/files/fbhyve.in Tue Aug 27 22:33:57 2024 +0200 +++ b/files/fbhyve.in Wed Aug 28 09:08:32 2024 +0200 @@ -127,17 +127,24 @@ fbhyve_pre_start() { + local _level + + if [ -z "${rc_force}" ]; then + _level="ERROR:" + else + _level="WARNING:" + fi if ! load_kld -m vmm vmm.ko; then echo "ERROR: Cannot load kernel module \`vmm'" 1>&2 - return 1 + [ -z "${rc_force}" ] && return 1 fi if [ -e "/dev/vmm/${_vm}" ]; then - echo "ERROR: VM \`${_vm}' already created in the VM monitor" 1>&2 - return 1 + echo "${_level} VM \`${_vm}' already created in the VM monitor" 1>&2 + [ -z "${rc_force}" ] && return 1 fi if ${command} has-session -t "${_session}" 2>/dev/null; then - echo "ERROR: tmux session \`${_session}' already exists" 1>&2 - return 1 + echo "${_level} tmux session \`${_session}' already exists" 1>&2 + [ -z "${rc_force}" ] && return 1 fi return 0 }