merged upstream

This commit is contained in:
Phil Clifford 2023-04-30 12:59:16 +01:00
commit 0581f34e3c
No known key found for this signature in database
GPG Key ID: 3B0A3BA167A07F7D
7 changed files with 113 additions and 11 deletions

View File

@ -326,7 +326,8 @@ supported.
- Use cursor keys and enter key to select the **macOS Base System**
- From **macOS Utilities**
- Click **Disk Utility** and **Continue**
- Select `QEMU HARDDISK Media` (\~103.08GB) from the list and
- Select `QEMU HARDDISK Media` (\~103.08GB) from the list
(on Big Sur and above use `Apple Inc. VirtIO Block Device`) and
click **Erase**.
- Enter a `Name:` for the disk
- If you are installing macOS Mojave or later (Catalina, Big
@ -776,7 +777,7 @@ You can also pass optional parameters
```
<!-- [[[end]]] -->
```
## Desktop shortcuts
Desktop shortcuts can be created for a VM, the shortcuts are saved in

View File

@ -1,4 +1,4 @@
.\" Automatically generated by Pandoc 2.19.2
.\" Automatically generated by Pandoc 2.17.1.1
.\"
.\" Define V font for inline verbatim, using C font in formats
.\" that render this, and otherwise B font.
@ -403,6 +403,8 @@ All the official Ubuntu flavours are supported, just replace
.IP \[bu] 2
\f[V]openbsd\f[R] (OpenBSD)
.IP \[bu] 2
\f[V]openindiana\f[R] (OpenIndiana)
.IP \[bu] 2
\f[V]opensuse\f[R] (openSUSE)
.IP \[bu] 2
\f[V]oraclelinux\f[R] (Oracle Linux)

View File

@ -293,6 +293,7 @@ with your preferred flavour.
- `netbsd` (NetBSD)
- `nixos` (NixOS)
- `openbsd` (OpenBSD)
- `openindiana` (OpenIndiana)
- `opensuse` (openSUSE)
- `oraclelinux` (Oracle Linux)
- `popos` (Pop!\_OS)

View File

@ -1,4 +1,4 @@
.\" Automatically generated by Pandoc 2.19.2
.\" Automatically generated by Pandoc 2.17.1.1
.\"
.\" Define V font for inline verbatim, using C font in formats
.\" that render this, and otherwise B font.
@ -185,6 +185,8 @@ All the official Ubuntu flavours are supported, just replace
.IP \[bu] 2
\f[V]openbsd\f[R] (OpenBSD)
.IP \[bu] 2
\f[V]openindiana\f[R] (OpenIndiana)
.IP \[bu] 2
\f[V]opensuse\f[R] (openSUSE)
.IP \[bu] 2
\f[V]oraclelinux\f[R] (Oracle Linux)

View File

@ -125,6 +125,7 @@ with your preferred flavour.
- `netbsd` (NetBSD)
- `nixos` (NixOS)
- `openbsd` (OpenBSD)
- `openindiana` (OpenIndiana)
- `opensuse` (openSUSE)
- `oraclelinux` (Oracle Linux)
- `popos` (Pop!\_OS)

View File

@ -468,7 +468,7 @@ function vm_boot() {
# Make any OS specific adjustments
case ${guest_os} in
batocera|*bsd|freedos|haiku|linux)
batocera|*bsd|freedos|haiku|linux|*solaris)
CPU="-cpu host,kvm=on"
if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then
CPU="${CPU},topoext"
@ -486,6 +486,11 @@ function vm_boot() {
SMM="on"
fi
if [[ "${guest_os}" == *"solaris" ]]; then
MACHINE_TYPE="pc"
USB_CONTROLLER="xhci"
fi
if [ -z "${disk_size}" ]; then
disk_size="16G"
fi
@ -726,6 +731,8 @@ function vm_boot() {
gtk|none|spice) DISPLAY_DEVICE="qxl-vga";;
sdl|spice-app) DISPLAY_DEVICE="virtio-vga";;
esac
elif [ "${guest_os}" == "solaris" ]; then
DISPLAY_DEVICE="vmware-svga"
else
DISPLAY_DEVICE="qxl-vga"
fi
@ -763,7 +770,7 @@ function vm_boot() {
case ${DISPLAY_DEVICE} in
bochs-display) VIDEO="${VIDEO},vgamem=67108864";;
qxl|qxl-vga) VIDEO="${VIDEO},ram_size=65536,vram_size=65536,vgamem_mb=64";;
ati-vga|cirrus-vga|VGA) VIDEO="${VIDEO},vgamem_mb=64";;
ati-vga|cirrus-vga|VGA|vmware-svga) VIDEO="${VIDEO},vgamem_mb=64";;
esac
# Configure multiscreen if max_outputs was provided in the .conf file

View File

@ -58,21 +58,24 @@ function pretty_name() {
nixos) PRETTY_NAME="NixOS";;
macos) PRETTY_NAME="macOS";;
openbsd) PRETTY_NAME="OpenBSD";;
openindiana) PRETTY_NAME="OpenIndiana";;
opensuse) PRETTY_NAME="openSUSE";;
oraclelinux) PRETTY_NAME="Oracle Linux";;
popos) PRETTY_NAME="Pop!_OS";;
reactos) PRETTY_NAME="ReactOS";;
rebornos) PRETTY_NAME="RebornOS";;
rockylinux) PRETTY_NAME="Rocky Linux";;
holoiso) PRETTY_NAME="HoloISO";;
truenas-core) PRETTY_NAME="TrueNAS Core";;
truenas-scale) PRETTY_NAME="TrueNAS Scale";;
ubuntu-budgie) PRETTY_NAME="Ubuntu Budgie";;
ubuntucinnamon) PRETTY_NAME="Ubuntu Cinnamon";;
ubuntucinnamon) PRETTY_NAME="Ubuntu Cinnamon";;
ubuntukylin) PRETTY_NAME="Ubuntu Kylin";;
ubuntu-mate) PRETTY_NAME="Ubuntu MATE";;
ubuntu-server) PRETTY_NAME="Ubuntu Server";;
ubuntustudio) PRETTY_NAME="Ubuntu Studio";;
ubuntu-unity) PRETTY_NAME="Ubuntu Unity";;
vanillaos) PRETTY_NAME="Vanilla OS";;
void) PRETTY_NAME="Void Linux";;
vxlinux) PRETTY_NAME="VX Linux";;
zorin) PRETTY_NAME="Zorin OS";;
@ -209,6 +212,7 @@ function os_support() {
lubuntu \
macos \
openbsd \
openindiana \
opensuse \
oraclelinux \
popos \
@ -218,6 +222,7 @@ function os_support() {
siduction \
slackware \
solus \
holoiso \
tails \
truenas-core \
truenas-scale \
@ -229,6 +234,7 @@ function os_support() {
ubuntu-server \
ubuntustudio \
ubuntu-unity \
vanillaos \
void \
vxlinux \
windows \
@ -273,10 +279,16 @@ function editions_arcolinux() {
}
function releases_blendos() {
curl -s https://api.github.com/repos/blend-os/blendOS/releases |grep tag_name | grep -o -E '[[:digit:]]+\.[[:digit:]]+'
local RLIST
RLIST=$(curl -s https://api.github.com/repos/blend-os/blendOS/releases |grep tag_name | grep -o -E '[[:digit:]]+\.[[:digit:]]+' | tr ' \r\n' ' ')
echo ${RLIST}
}
function editions_blendos() {
echo gnome kde
}
function releases_cachyos() {
echo 2300305
}
@ -489,6 +501,14 @@ function releases_openbsd(){
echo ${OBSD_RELEASES}
}
function releases_openindiana(){
echo 20230421
}
function editions_openindiana(){
echo gui text minimal
}
function releases_opensuse(){
echo 15.0 15.1 15.2 15.3 15.4 microos tumbleweed
}
@ -549,6 +569,10 @@ function editions_solus() {
echo Budgie GNOME MATE Plasma
}
function releases_holoiso() {
echo 4.0
}
function releases_tails() {
echo stable
}
@ -650,6 +674,10 @@ function releases_ubuntu-server() {
daily-live
}
function releases_vanillaos() {
echo 22.10
}
function releases_void() {
echo current
}
@ -848,6 +876,9 @@ function make_vm_config() {
openbsd)
GUEST="openbsd"
IMAGE_TYPE="iso";;
openindiana)
GUEST="solaris"
IMAGE_TYPE="iso";;
reactos)
GUEST="reactos"
IMAGE_TYPE="iso";;
@ -886,6 +917,9 @@ EOF
case ${OS} in
alma|centos-stream|endless|nixos|oraclelinux|popos|rockylinux)
echo "disk_size=\"32G\"" >> "${CONF_FILE}";;
openindiana)
echo "boot=\"legacy\"" >> "${CONF_FILE}"
echo "disk_size=\"32G\"" >> "${CONF_FILE}";;
batocera)
echo "disk_size=\"8G\"" >> "${CONF_FILE}";;
dragonflybsd|haiku|openbsd|netbsd|slackware|tails)
@ -905,7 +939,6 @@ EOF
echo "ram=\"128M\"" >> "${CONF_FILE}"
;;
truenas-scale|truenas-core)
echo
echo "boot=\"legacy\"" >> "${CONF_FILE}"
# the rest is non-functional
# echo "bootdrive_size=\"5G\"" >> "${CONF_FILE}" # boot drive
@ -921,6 +954,10 @@ EOF
echo "tpm=\"on\"" >> "${CONF_FILE}"
fi
;;
vanillaos)
## Minimum 50G for abroot
echo "disk_size=\"64G\"" >> "${CONF_FILE}"
;;
zorin)
case ${EDITION} in
education64|edulite64)
@ -1036,9 +1073,41 @@ function get_arcolinux() {
}
function get_blendos() {
local EDITION="${1:-}"
local HASH=""
local URL="$(curl -s https://api.github.com/repos/blend-os/blendOS/releases |grep 'browser_download_url'|grep ${RELEASE} | grep -o '\"http.*\.iso\"'| cut -d\" -f 2| head -1)"
HASH=$(curl -s "${URL}.sha256sum" | cut -d' ' -f1)
local URL=""
case ${RELEASE} in
23.01)
URL="$(curl -s https://api.github.com/repos/blend-os/blendOS/releases |grep 'browser_download_url'|grep ${RELEASE} | grep -o '\"http.*\.iso\"'| cut -d\" -f 2| head -1)"
HASH=$(curl -s "${URL}.sha256sum" | cut -d' ' -f1)
;;
23.04)
case ${EDITION} in
gnome)
TMPURL=$(wget -q -S -O- --max-redirect=0 "https://sourceforge.net/projects/blendos/files/23.04-1/${EDITION^^}/blendOS-2023.04.22-x86_64-${EDITION,,}.iso/download" 2>&1 | grep -i Location | cut -d' ' -f4)
URL=${TMPURL%\?*}
HASH=$(curl -s https://sourceforge.net/projects/blendos/files/${RELEASE}-1/${EDITION:-GNOME}/|grep -o -E '\"sha1\":\".*\"'|cut -d\" -f4)
;;
kde|plasma)
local ED_DE="Plasma"
TMPURL=$(wget -q -S -O- --max-redirect=0 "https://sourceforge.net/projects/blendos/files/23.04-1/${ED_DE^}/blendOS-2023.04.22-x86_64-${ED_DE,,}.iso/download" 2>&1 | grep -i Location | cut -d' ' -f4)
URL=${TMPURL%\?*}
HASH=$(curl -s https://sourceforge.net/projects/blendos/files/${RELEASE}-1/Plasma/|grep -o -E '\"sha1\":\".*\"'|cut -d\" -f4)
;;
esac
;;
esac
echo "${URL} ${HASH}"
}
function get_vanillaos() {
# maybe use github api and dynamism for R2.0 but for 22.10 just
# hit their CDN
#
# https://cdn.vanillaos.org/assets/ISO/22.10-r8/VanillaOS-22.10-all.20230226.md5.txt
# https://cdn.vanillaos.org/assets/ISO/22.10-r8/VanillaOS-22.10-all.20230226.sha256.txt
local HASH=$(curl -s "https://cdn.vanillaos.org/assets/ISO/22.10-r8/VanillaOS-22.10-all.20230226.sha256.txt" | cut -d' ' -f1)
local URL="https://cdn.vanillaos.org/assets/ISO/22.10-r8/VanillaOS-22.10-all.20230226.iso"
echo "${URL} ${HASH}"
}
@ -1513,6 +1582,15 @@ function get_openbsd() {
echo "${URL}/${ISO} ${HASH}"
}
function get_openindiana(){
local HASH=""
local ISO=""
local URL=""
URL="https://dlc.openindiana.org/isos/hipster/${RELEASE}"
ISO="OI-hipster-${EDITION}-${RELEASE}.iso"
HASH=$(wget -q -O- "${URL}/${ISO}.sha256" |cut -d' ' -f1)
echo "${URL}/${ISO} ${HASH}"
}
function get_opensuse() {
local HASH=""
local ISO=""
@ -1613,6 +1691,16 @@ function get_solus() {
echo "${URL}/${ISO} ${HASH}"
}
function get_holoiso() {
local HASH=""
local DATE="20221211"
local ISO="HoloISO_${RELEASE}_OfflineInstaller-${DATE}_1636-x86_64.iso"
local URL="http://holoiso.itsvixano.me"
HASH=$(wget -q -O- "${URL}/${ISO}.sha256sum" | cut -d' ' -f1)
echo "${URL}/${ISO} ${HASH}"
}
function get_tails() {
local ISO=""
local JSON=""