Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RC order fix #537

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

RC order fix #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a58f21f
Split startup into two phases (bridges/vms)
eborisch Dec 1, 2023
d123c52
Restore 'command' variable; still needed
eborisch Dec 1, 2023
7fdd253
Update man page with suggested iscsictl_flags
eborisch Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions rc.d/vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
# $FreeBSD$

# PROVIDE: vm
# REQUIRE: NETWORKING SERVERS dmesg
# BEFORE: dnsmasq ipfw pf
# REQUIRE: DAEMON vm_net
# KEYWORD: shutdown nojail

. /etc/rc.subr
Expand All @@ -23,7 +22,6 @@ stop_cmd="${command} stopall -f"

vm_start()
{
env rc_force="$rc_force" ${command} init
env rc_force="$rc_force" ${command} startall >/dev/null &
}

Expand Down
28 changes: 28 additions & 0 deletions rc.d/vm_net
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/sh
#
# $FreeBSD$

# PROVIDE: vm_net
# REQUIRE: bridge
# BEFORE: dnsmasq ipfw pf
# KEYWORD: nojail

. /etc/rc.subr

: ${vm_enable="NO"}

name=vm
desc="Start networking (bridges) for vm-bhyve guests on boot"
rcvar=vm_enable

load_rc_config $name

command="/usr/local/sbin/${name}"
start_cmd="${name}_start"

vm_start()
{
env rc_force="$rc_force" ${command} init
}

run_rc_command "$1"
9 changes: 9 additions & 0 deletions vm.8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,6 +1304,15 @@ detected and used by setting this option to
and
.Pa diskX_name
as described above.
.Pp
When
.Sy iscsi
disks are used with auto-start, set the following in
.Pa /etc/rc.conf
to prevent launching vms before iscsi connections are completed:
.Bd -literal -offset indent
iscsictl_flags="-Aa -w 60"
.Ed
.It disk0_opts
Any additional options to use for this disk device.
Multiple options can be specified, separated by a comma.
Expand Down