From cc62b5ac78833e204fcb306656b358f42d22edc7 Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Fri, 19 Aug 2022 22:36:32 +0100 Subject: [PATCH 1/6] Incorporate additional changes into generation --- README.md | 7 ++++--- build-docs | 2 +- docs/quickemu_conf.1 | 16 ++++++++++++++-- docs/quickemu_conf.1.md | 7 ++++--- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index b44f342..10fd614 100644 --- a/README.md +++ b/README.md @@ -635,9 +635,10 @@ additional line to your virtual machine configuration: - `network="br0"` -If you want to have a persistent MAC address for your bridged network interface -in the gust VM you can add `macaddr` to the virtual machine configuration. QEMU -requires that the MAC address is in the range: **52:54:00:AB:00:00 - 52:54:00:AB:FF:FF** +If you want to have a persistent MAC address for your bridged network +interface in the guest VM you can add `macaddr` to the virtual machine +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: diff --git a/build-docs b/build-docs index aa63963..767adf6 160000 --- a/build-docs +++ b/build-docs @@ -1 +1 @@ -Subproject commit aa63963073cda6f776dbbefc60b784a5425be6a9 +Subproject commit 767adf6ba0d7c69af481cc3a87c31bd17d484cdd diff --git a/docs/quickemu_conf.1 b/docs/quickemu_conf.1 index 63471eb..497318d 100644 --- a/docs/quickemu_conf.1 +++ b/docs/quickemu_conf.1 @@ -35,7 +35,6 @@ These are the options and defaults for the .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 diff --git a/docs/quickemu_conf.1.md b/docs/quickemu_conf.1.md index 45feee7..c165ab7 100644 --- a/docs/quickemu_conf.1.md +++ b/docs/quickemu_conf.1.md @@ -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 -in the gust VM you can add `macaddr` to the virtual machine configuration. QEMU -requires that the MAC address is in the range: **52:54:00:AB:00:00 - 52:54:00:AB:FF:FF** +If you want to have a persistent MAC address for your bridged network +interface in the guest VM you can add `macaddr` to the virtual machine +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: From 0185369632bad472b6a208036a3c29d1f4b63533 Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Thu, 1 Sep 2022 01:01:49 +0100 Subject: [PATCH 2/6] Removed spurious duplication from documentation Co-authored-by: mk3z --- README.md | 5 +---- build-docs | 2 +- docs/quickemu.1 | 7 ++----- docs/quickemu.1.md | 6 +----- docs/quickemu_conf.1 | 4 ++-- docs/quickemu_conf.1.md | 2 +- docs/quickget.1 | 7 ++----- docs/quickget.1.md | 6 +----- 8 files changed, 11 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 10fd614..981e5dd 100644 --- a/README.md +++ b/README.md @@ -231,10 +231,6 @@ with your preferred flavour. `quickget` also supports: -## Other Operating Systems - -`quickget` also supports: - - `alma` (Alma Linux) - `alpine` (Alpine Linux) - `android` (Android x86) @@ -742,6 +738,7 @@ You can also pass optional parameters --version : Print version ``` + ## Desktop shortcuts diff --git a/build-docs b/build-docs index 767adf6..da4705f 160000 --- a/build-docs +++ b/build-docs @@ -1 +1 @@ -Subproject commit 767adf6ba0d7c69af481cc3a87c31bd17d484cdd +Subproject commit da4705f350bb95c08dfd7e31627285ffc8019045 diff --git a/docs/quickemu.1 b/docs/quickemu.1 index 8cb668d..19493ed 100644 --- a/docs/quickemu.1 +++ b/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 diff --git a/docs/quickemu.1.md b/docs/quickemu.1.md index 04d1ae4..3279bed 100644 --- a/docs/quickemu.1.md +++ b/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) diff --git a/docs/quickemu_conf.1 b/docs/quickemu_conf.1 index 497318d..c012bdd 100644 --- a/docs/quickemu_conf.1 +++ b/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 diff --git a/docs/quickemu_conf.1.md b/docs/quickemu_conf.1.md index c165ab7..6c52fed 100644 --- a/docs/quickemu_conf.1.md +++ b/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 diff --git a/docs/quickget.1 b/docs/quickget.1 index 2e85efe..911c807 100644 --- a/docs/quickget.1 +++ b/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 diff --git a/docs/quickget.1.md b/docs/quickget.1.md index ce09197..a3693f9 100644 --- a/docs/quickget.1.md +++ b/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) From e03c5e76ba2205bae197aacb2d5ff27698f4868c Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Sun, 11 Sep 2022 11:54:45 +0100 Subject: [PATCH 3/6] debian 11.5 and 10.13 released --- quickget | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quickget b/quickget index d1cb7d5..7d4c3c7 100755 --- a/quickget +++ b/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() { @@ -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 From 7641ab5038c930e805f1e333288bdf3177158a6c Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Mon, 12 Sep 2022 02:08:45 +0100 Subject: [PATCH 4/6] MX 21.2 released --- quickget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickget b/quickget index 7d4c3c7..6ebd65d 100755 --- a/quickget +++ b/quickget @@ -382,7 +382,7 @@ function releases_lmde(){ } function releases_mxlinux(){ - echo 21.1 + echo 21.2 } function editions_mxlinux(){ From 0317b5e75d66f2533dbea976eceb4e148c7fae25 Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Mon, 12 Sep 2022 02:49:07 +0100 Subject: [PATCH 5/6] devuan chimaera 4.0.2 released --- quickget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickget b/quickget index 6ebd65d..58f1b85 100755 --- a/quickget +++ b/quickget @@ -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}" From 1a238de11341a5ced2315b121111f1061d936c2e Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Mon, 12 Sep 2022 03:21:09 +0100 Subject: [PATCH 6/6] deepin releases 20.6 and 20.7 added --- quickget | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickget b/quickget index 58f1b85..9872233 100755 --- a/quickget +++ b/quickget @@ -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() {