Merge remote-tracking branch 'origin/master'

README.md

@@ -232,10 +232,6 @@ with your preferred flavour.
 
 `quickget` also supports:
 
-## Other Operating Systems
-
-`quickget` also supports:
-
 -   `alma` (Alma Linux)
 -   `alpine` (Alpine Linux)
 -   `android` (Android x86)
@@ -636,9 +632,10 @@ additional line to your virtual machine configuration:
 
 -   `network="br0"`
 
-If you want to have a persistent MAC address for your bridged network interface
+If you want to have a persistent MAC address for your bridged network
-in the gust VM you can add `macaddr` to the virtual machine configuration. QEMU
+interface in the guest VM you can add `macaddr` to the virtual machine
-requires that the MAC address is in the range: **52:54:00:AB:00:00 - 52:54:00:AB:FF:FF**
+configuration. QEMU requires that the MAC address is in the range:
+**52:54:00:AB:00:00 - 52:54:00:AB:FF:FF**
 
 So you can generate your own MAC addresses with:
 
@@ -742,6 +739,7 @@ You can also pass optional parameters
   --version                         : Print version
 
 ```
+
 <!-- [[[end]]] -->
 
 ## Desktop shortcuts

build-docs

@@ -1 +1 @@
-Subproject commit aa63963073cda6f776dbbefc60b784a5425be6a9
+Subproject commit da4705f350bb95c08dfd7e31627285ffc8019045

docs/quickemu.1

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pandoc 2.19
+.\" Automatically generated by Pandoc 2.19.2
 .\"
 .\" Define V font for inline verbatim, using C font in formats
 .\" that render this, and otherwise B font.
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "QUICKEMU" "1" "August 19, 2022" "quickemu" "Quickemu User Manual"
+.TH "QUICKEMU" "1" "September 1, 2022" "quickemu" "Quickemu User Manual"
 .hy
 .SH NAME
 .PP
@@ -326,9 +326,6 @@ All the official Ubuntu flavours are supported, just replace
 .SS Other Operating Systems
 .PP
 \f[V]quickget\f[R] also supports:
-.SS Other Operating Systems
-.PP
-\f[V]quickget\f[R] also supports:
 .IP \[bu] 2
 \f[V]alma\f[R] (Alma Linux)
 .IP \[bu] 2

docs/quickemu.1.md

@@ -1,6 +1,6 @@
 ---
 author: Martin Wimpress
-date: August 19, 2022
+date: September 1, 2022
 footer: quickemu
 header: Quickemu User Manual
 section: 1
@@ -255,10 +255,6 @@ with your preferred flavour.
 
 `quickget` also supports:
 
-## Other Operating Systems
-
-`quickget` also supports:
-
 -   `alma` (Alma Linux)
 -   `alpine` (Alpine Linux)
 -   `android` (Android x86)

docs/quickemu_conf.1

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pandoc 2.19
+.\" Automatically generated by Pandoc 2.19.2
 .\"
 .\" Define V font for inline verbatim, using C font in formats
 .\" that render this, and otherwise B font.
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "QUICKEMU_CONF" "1" "August 19, 2022" "quickemu_conf" "Quickemu Configuration Manual"
+.TH "QUICKEMU_CONF" "1" "September 1, 2022" "quickemu_conf" "Quickemu Configuration Manual"
 .hy
 .SH NAME
 .PP
@@ -35,7 +35,6 @@ These are the options and defaults for the <vm>.conf file
 \f[C]
 # Lowercase variables are used in the VM config file only
 boot=\[dq]efi\[dq]
-bridge=\[dq]\[dq]
 cpu_cores=\[dq]\[dq]
 disk_img=\[dq]\[dq]
 disk_size=\[dq]\[dq]
@@ -44,7 +43,9 @@ floppy=\[dq]\[dq]
 guest_os=\[dq]linux\[dq]
 img=\[dq]\[dq]
 iso=\[dq]\[dq]
+macaddr=\[dq]\[dq]
 macos_release=\[dq]\[dq]
+network=\[dq]\[dq]
 port_forwards=()
 preallocation=\[dq]off\[dq]
 ram=\[dq]\[dq]
@@ -97,6 +98,7 @@ disk_img=\[dq]windows-11/disk.qcow2\[dq]
 iso=\[dq]windows-11/Win11_EnglishInternational_x64.iso\[dq]
 fixed_iso=\[dq]windows-11/virtio-win.iso\[dq]
 tpm=\[dq]on\[dq]
+secureboot=\[dq]on\[dq]
 \f[R]
 .fi
 .IP \[bu] 2
@@ -227,9 +229,19 @@ Add this additional line to your virtual machine configuration:
 .SH Bridged networking
 .PP
 Connect your virtual machine to a preconfigured network bridge.
-Add an additional line to your virtual machine configuration
+Add an additional line to your virtual machine configuration:
 .IP \[bu] 2
 \f[V]network=\[dq]br0\[dq]\f[R]
+.PP
+If you want to have a persistent MAC address for your bridged network
+interface in the guest VM you can add \f[V]macaddr\f[R] to the virtual
+machine configuration.
+QEMU requires that the MAC address is in the range:
+\f[B]52:54:00:AB:00:00 - 52:54:00:AB:FF:FF\f[R]
+.PP
+So you can generate your own MAC addresses with:
+.IP \[bu] 2
+\f[V]macaddr=\[dq]52:54:00:AB:51:AE\[dq]\f[R]
 .SH USB redirection
 .PP
 Quickemu supports USB redirection via SPICE pass-through and host

docs/quickemu_conf.1.md

@@ -1,6 +1,6 @@
 ---
 author: Martin Wimpress
-date: August 19, 2022
+date: September 1, 2022
 footer: quickemu_conf
 header: Quickemu Configuration Manual
 section: 1
@@ -208,9 +208,10 @@ additional line to your virtual machine configuration:
 
 -   `network="br0"`
 
-If you want to have a persistent MAC address for your bridged network interface
+If you want to have a persistent MAC address for your bridged network
-in the gust VM you can add `macaddr` to the virtual machine configuration. QEMU
+interface in the guest VM you can add `macaddr` to the virtual machine
-requires that the MAC address is in the range: **52:54:00:AB:00:00 - 52:54:00:AB:FF:FF**
+configuration. QEMU requires that the MAC address is in the range:
+**52:54:00:AB:00:00 - 52:54:00:AB:FF:FF**
 
 So you can generate your own MAC addresses with:
 

docs/quickget.1

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pandoc 2.19
+.\" Automatically generated by Pandoc 2.19.2
 .\"
 .\" Define V font for inline verbatim, using C font in formats
 .\" that render this, and otherwise B font.
@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "QUICKGET" "1" "August 19, 2022" "quickget" "Quickget User Manual"
+.TH "QUICKGET" "1" "September 1, 2022" "quickget" "Quickget User Manual"
 .hy
 .SH NAME
 .PP
@@ -110,9 +110,6 @@ All the official Ubuntu flavours are supported, just replace
 .SS Other Operating Systems
 .PP
 \f[V]quickget\f[R] also supports:
-.SS Other Operating Systems
-.PP
-\f[V]quickget\f[R] also supports:
 .IP \[bu] 2
 \f[V]alma\f[R] (Alma Linux)
 .IP \[bu] 2

docs/quickget.1.md

@@ -1,6 +1,6 @@
 ---
 author: Martin Wimpress
-date: August 19, 2022
+date: September 1, 2022
 footer: quickget
 header: Quickget User Manual
 section: 1
@@ -88,10 +88,6 @@ with your preferred flavour.
 
 `quickget` also supports:
 
-## Other Operating Systems
-
-`quickget` also supports:
-
 -   `alma` (Alma Linux)
 -   `alpine` (Alpine Linux)
 -   `android` (Android x86)

quickget

@@ -263,7 +263,7 @@ function editions_centos-stream() {
 }
 
 function releases_debian() {
-    echo 10.11.0 11.2.0 11.3.0 11.4.0
+    echo 10.11.0 10.12.0 10.13.0 11.2.0 11.3.0 11.4.0 11.5.0
 }
 
 function editions_debian() {
@@ -271,7 +271,7 @@ function editions_debian() {
 }
 
 function releases_deepin() {
-    echo 20 20.1 20.2 20.2.1 20.2.2 20.2.3 20.2.4 20.3 20.4 20.5
+    echo 20 20.1 20.2 20.2.1 20.2.2 20.2.3 20.2.4 20.3 20.4 20.5 20.6 20.7
 }
 
 function releases_devuan() {
@@ -382,7 +382,7 @@ function releases_lmde(){
 }
 
 function releases_mxlinux(){
-    echo 21.1
+    echo 21.2
 }
 
 function editions_mxlinux(){
@@ -939,7 +939,7 @@ function get_debian() {
     local URL=""
 
     case ${RELEASE} in
-      11.4.0) URL="https://cdimage.debian.org/debian-cd/${RELEASE}-live/amd64/iso-hybrid";;
+      11.5.0) URL="https://cdimage.debian.org/debian-cd/${RELEASE}-live/amd64/iso-hybrid";;
       *)      URL="https://cdimage.debian.org/cdimage/archive/${RELEASE}-live/amd64/iso-hybrid/";;
     esac
 
@@ -984,7 +984,7 @@ function get_devuan() {
 
     case ${RELEASE} in
       beowulf) ISO="devuan_${RELEASE}_3.1.1_amd64_desktop-live.iso";;
-      chimaera) ISO="devuan_${RELEASE}_4.0.0_amd64_desktop-live.iso";;
+      chimaera) ISO="devuan_${RELEASE}_4.0.2_amd64_desktop-live.iso";;
     esac
     HASH=$(wget -q -O- "${URL}/SHASUMS.txt" | grep "${ISO}" | cut -d' ' -f1)
     echo "${URL}/${ISO} ${HASH}"