Skip to content

Commit 587722c

Browse files
author
olevole
committed
style
1 parent fa54a7f commit 587722c

File tree

7 files changed

+32
-8
lines changed

7 files changed

+32
-8
lines changed

‎bhyvectl/bconstruct-tui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,8 @@ while [ 1 ]; do
440440
;;
441441
"GO")
442442
# store last choices
443-
/usr/local/cbsd/misc/cbsdsysrc -qf ${tmpdir}/bconstruct.conf last_vm_os_type="${vm_os_type}" > /dev/null 2>&1
444-
/usr/local/cbsd/misc/cbsdsysrc -qf ${tmpdir}/bconstruct.conf last_vm_os_profile="${vm_os_profile}" > /dev/null 2>&1
443+
/usr/local/cbsd/misc/cbsdsysrc -qf ${tmpdir}/bconstruct.conf last_vm_os_type="${vm_os_type}" \
444+
last_vm_os_profile="${vm_os_profile}" > /dev/null 2>&1
445445
gen_newjail_conf
446446
;;
447447
"-")

‎bhyvectl/bls

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ ${H3_COLOR}Examples${N0_COLOR}:
3838
# cbsd bls vm1
3939
# cbsd bls display=jname,vm_os_profile,vm_ram,vnc header=0
4040

41+
${H3_COLOR}See also${N0_COLOR}:
42+
43+
cbsd bget --help
44+
cat ~cbsd/etc/defaults/bls.conf
45+
https://github.com/cbsd/cbsd/blob/develop/share/docs/general/tag_n_facts.md
46+
4147
"
4248
EXTHELP="wf_bls"
4349

‎etc/defaults/bhyve-default-default.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# JCREATE part
1+
# BCREATE part
22
# jail skeldir for overwriting default files use $workdir for relative path from
33
# workdir or full path to directory. default: $workdir/share/${platform}-jail-skel
44
jail_profile="default"

‎jailctl/jls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ ${H3_COLOR}See also${N0_COLOR}:
4747
cbsd jget --help
4848
cbsd jrctl --help
4949
cat ~cbsd/etc/defaults/jls.conf
50+
https://github.com/cbsd/cbsd/blob/develop/share/docs/general/tag_n_facts.md
5051

5152
"
5253
EXTHELP="wf_jls"

‎qemuctl/qls

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ ${H3_COLOR}Examples${N0_COLOR}:
3636

3737
# cbsd qls display=jname,vm_os_profile,vm_ram,vnc header=0
3838

39+
${H3_COLOR}See also${N0_COLOR}:
40+
41+
cbsd qget --help
42+
cat ~cbsd/etc/defaults/qls.conf
43+
https://github.com/cbsd/cbsd/blob/develop/share/docs/general/tag_n_facts.md
44+
3945
"
4046

4147
EXTHELP="wf_qls"

‎share/docs/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Exploring the CBSD virtual environment management framework](https://eerielinux.
1414
- [Working with CBSDfile](general/cbsdfile.md) ( up, destroy, login, exec )
1515
- [Broker driven CBSD cluster (example)](general/)
1616
- [CBSD integration with PHPIPAM (IP management)](general/wf_ipam.md)
17+
- [Tags and custom facts](general/tag_n_facts.md) ( jget/bget/xget/jls/bls/bget.. )
1718
- [API module: private cloud via API](general/cbsd_api.md)
1819
- [CBSD and OCI containers](general/cbsd_oci.md)
1920
- [About fetch work: CBSD mirrors](https://github.com/cbsd/mirrors)

‎share/docs/qemu/cbsd_qemu_quickstart.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,16 @@ QEMU/KVM/NVMM support matrix:
1919
| NetBSD | Y | Y | N |
2020
| Linux | Y | N | Y |
2121

22+
<details>
23+
<summary>Linux notes</summary>
24+
2225
## CBSD + QEMU + Linux
2326

27+
</details>
28+
29+
30+
<details>
31+
<summary>FreeBSD notes</summary>
2432

2533
## CBSD + QEMU + FreeBSD
2634

@@ -62,6 +70,11 @@ cbsd qcreate jname=vm2 vm_os_type=freebsd vm_os_profile=FreeBSD-aarch64-14.2 vm_
6270
cbsd up
6371
```
6472

73+
</details>
74+
75+
<details>
76+
<summary>DragonflyBSD notes</summary>
77+
6578
## CBSD + QEMU + DragonflyBSD
6679

6780
**CBSD** version 13.0.18 added support for [QEMU](http://wiki.qemu.org/Main_Page) and [NVMM](https://blog.netbsd.org/tnf/entry/from_zero_to_nvmm) accelerator. Similar to the commands for jail, bhyve and XEN, you can create and manage QEMU-based virtual machines through similar commands and dialog forms, while the commands are prefixed with 'q': qstart, qdestroy ..
@@ -72,21 +85,18 @@ When using NVMM, make sure the module is loaded:
7285

7386
```
7487
kldload nvmm
75-
7688
```
7789

7890
Don't forget to add nvmm into auto-load via /boot/loader.conf:
7991

8092
```
8193
nvmm_load="YES"
82-
8394
```
8495

8596
You can check the status of NVMM through the command:
8697

8798
```
8899
nvmmctl identify
89-
90100
```
91101

92102
If the module is missing or does not work correctly, you can create VMs, but they will work without acceleration.
@@ -97,11 +107,12 @@ You need to install QEMU package named 'qemu' (or 'qemu-devel' in some cases):
97107

98108
```
99109
pkg install qemu
100-
101110
```
102111

103112
Detailed description of working with NVMM/QEMU on the: [DragonflyBSD project page](https://www.dragonflybsd.org/docs/docs/howtos/nvmm/), [NetBSD project guide](https://www.netbsd.org/docs/guide/en/chap-virt.html)
104113

114+
</details>
115+
105116
When working with emulation of non-native architectures, you may need firmware and bios to boot systems:
106117

107118
For example:
@@ -127,7 +138,6 @@ You can work with QEMU-based virtual machines through the usual CBSD methods: TU
127138
cbsd qcreate --help
128139
cbsd qstart --help
129140
cbsd qdestroy --help
130-
131141
```
132142

133143
## [Demo of working with QEMU via CBSD]()

0 commit comments

Comments
 (0)