AIR/quickemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected ubuntu-server implementation

Browse Source 
naming aligned
releases corrected
implemented daily-live

maybe some more alignement and refactoring possible
This commit is contained in:
Phil Clifford 2023-04-30 01:56:29 +01:00
parent 2a8bc711c4
commit 0a0aa4dcb9
No known key found for this signature in database
GPG Key ID: 3B0A3BA167A07F7D
1 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
quickget
View File

@ -70,7 +70,7 @@ function pretty_name() {
ubuntucinnamon) PRETTY_NAME="Ubuntu Cinnamon";; ubuntucinnamon) PRETTY_NAME="Ubuntu Cinnamon";;
ubuntukylin) PRETTY_NAME="Ubuntu Kylin";; ubuntukylin) PRETTY_NAME="Ubuntu Kylin";;
ubuntu-mate) PRETTY_NAME="Ubuntu MATE";; ubuntu-mate) PRETTY_NAME="Ubuntu MATE";;
ubuntuserver) PRETTY_NAME="Ubuntu Server";; ubuntu-server) PRETTY_NAME="Ubuntu Server";;
ubuntustudio) PRETTY_NAME="Ubuntu Studio";; ubuntustudio) PRETTY_NAME="Ubuntu Studio";;
ubuntu-unity) PRETTY_NAME="Ubuntu Unity";; ubuntu-unity) PRETTY_NAME="Ubuntu Unity";;
void) PRETTY_NAME="Void Linux";; void) PRETTY_NAME="Void Linux";;
@ -88,7 +88,7 @@ function validate_release() {
DISPLAY_NAME="$(pretty_name "${OS}")" DISPLAY_NAME="$(pretty_name "${OS}")"
case ${OS} in case ${OS} in
*ubuntuserver*) RELEASE_GENERATOR="releases_ubuntuserver";; *ubuntu-server*) RELEASE_GENERATOR="releases_ubuntu-server";;
*ubuntu*) RELEASE_GENERATOR="releases_ubuntu";; *ubuntu*) RELEASE_GENERATOR="releases_ubuntu";;
*) RELEASE_GENERATOR="${1}";; *) RELEASE_GENERATOR="${1}";;
esac esac
@ -226,7 +226,7 @@ function os_support() {
ubuntucinnamon \ ubuntucinnamon \
ubuntukylin \ ubuntukylin \
ubuntu-mate \ ubuntu-mate \
ubuntuserver \ ubuntu-server \
ubuntustudio \ ubuntustudio \
ubuntu-unity \ ubuntu-unity \
void \ void \
@ -642,8 +642,12 @@ function releases_ubuntu() {
fi fi
} }
function releases_ubuntuserver() { function releases_ubuntu-server() {
echo 20.04 20.04.5 22.04 22.04.1 local LTS_SUPPORT="18.04 20.04 22.04"
local INTERIM_SUPPORT="22.10 23.04"
echo ${LTS_SUPPORT} \
${INTERIM_SUPPORT} \
daily-live
} }
function releases_void() { function releases_void() {
@ -908,7 +912,7 @@ EOF
# echo "1stdrive_size=\"20G\"" >> "${CONF_FILE}" # for testing # echo "1stdrive_size=\"20G\"" >> "${CONF_FILE}" # for testing
# echo "2nddrive_size=\"20G\"" >> "${CONF_FILE}" # again, for testing # echo "2nddrive_size=\"20G\"" >> "${CONF_FILE}" # again, for testing
;; ;;
ubuntuserver) ubuntu-server)
# 22.04+ fails on LVM build if disk size is < 10G # 22.04+ fails on LVM build if disk size is < 10G
# 22.04.1 fails on auto-install if TPM is disabled # 22.04.1 fails on auto-install if TPM is disabled
echo "disk_size=\"10G\"" >> "${CONF_FILE}" echo "disk_size=\"10G\"" >> "${CONF_FILE}"
@ -1644,18 +1648,31 @@ function get_truenas-core() {
echo "${URL} ${HASH}" echo "${URL} ${HASH}"
} }
function get_ubuntuserver() { function get_ubuntu-server() {
local EDITION="${1:-}"
local HASH=""
local ISO="ubuntu-${RELEASE}-live-server-amd64.iso"
local URL="https://releases.ubuntu.com/${RELEASE}"
HASH=$(wget -q -O- "${URL}/SHA256SUMS" | grep "${ISO}" | cut -d' ' -f1) local HASH=""
echo "${URL}/${ISO} ${HASH}" local ISO=""
local URL="https://releases.ubuntu.com/${RELEASE}"
web_get "${URL}/${ISO}" "${VM_PATH}" if wget -q --spider "${URL}/SHA256SUMS"; then
check_hash "${ISO}" "${HASH}" ISO=$(wget -q -O- "${URL}/SHA256SUMS" | grep 'live-server' | grep amd64 | grep iso | cut -d'*' -f2)
make_vm_config "${ISO}" HASH=$(wget -q -O- "${URL}/SHA256SUMS" | grep 'live-server' | grep amd64 | grep iso |cut -d' ' -f1)
else
ISO=$(wget -q -O- "${URL}/MD5SUMS" | grep 'live-server' | grep amd64 | grep iso | cut -d' ' -f3)
HASH=$(wget -q -O- "${URL}/MD5SUMS" | grep 'live-server' | grep amd64 | grep iso | cut -d' ' -f1)
fi
if [[ "${RELEASE}" == *"daily"* ]] || [ "${RELEASE}" == "dvd" ]; then
URL="https://cdimage.ubuntu.com/${OS}/${RELEASE}/current"
ISO=$(wget -q -O- "${URL}/SHA256SUMS" | grep 'live-server' | grep amd64 | grep iso | cut -d'*' -f2)
HASH=$(wget -q -O- "${URL}/SHA256SUMS" | grep 'live-server' | grep amd64 | grep iso |cut -d' ' -f1)
zsync_get "${URL}/${ISO}" "${VM_PATH}" "${OS}-devel.iso"
make_vm_config "${OS}-devel.iso"
else
web_get "${URL}/${ISO}" "${VM_PATH}"
check_hash "${ISO}" "${HASH}"
make_vm_config "${ISO}"
fi
} }
function get_ubuntu() { function get_ubuntu() {
@ -2261,11 +2278,11 @@ if [ -n "${2}" ]; then
# macOS doesn't use create_vm() # macOS doesn't use create_vm()
validate_release releases_macos validate_release releases_macos
get_macos get_macos
elif [[ "${OS}" == *"ubuntuserver"* ]]; then elif [[ "${OS}" == *"ubuntu-server"* ]]; then
# (Comes before regular Ubuntu, or the code tries to download the desktop) # # (Comes before regular Ubuntu, or the code tries to download the desktop) #
# Ubuntu doesn't use create_vm() # Ubuntu doesn't use create_vm()
validate_release releases_ubuntuserver validate_release releases_ubuntu-server
get_ubuntuserver get_ubuntu-server
elif [[ "${OS}" == *"ubuntu"* ]]; then elif [[ "${OS}" == *"ubuntu"* ]]; then
# Ubuntu doesn't use create_vm() # Ubuntu doesn't use create_vm()
validate_release releases_ubuntu validate_release releases_ubuntu
@ -2296,9 +2313,9 @@ if [ -n "${2}" ]; then
else else
echo "ERROR! You must specify a release." echo "ERROR! You must specify a release."
case ${OS} in case ${OS} in
*ubuntuserver*) *ubuntu-server*)
echo -n " - Releases: " echo -n " - Releases: "
releases_ubuntuserver | sed -Ee 's/eol-\S+//g' # hide eol releases releases_ubuntu-server | sed -Ee 's/eol-\S+//g' # hide eol releases
;; ;;
*ubuntu*) *ubuntu*)
echo -n " - Releases: " echo -n " - Releases: "