From 0ae8b773ec070fd6a193f7e344c464fdc2d5b005 Mon Sep 17 00:00:00 2001 From: iliajie Date: Sun, 8 Jan 2023 21:16:09 +0200 Subject: [PATCH 1/3] Add support for ARM systems --- virtualmin-install.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/virtualmin-install.sh b/virtualmin-install.sh index be6142d..8d0f3d0 100644 --- a/virtualmin-install.sh +++ b/virtualmin-install.sh @@ -293,6 +293,9 @@ arch="$(uname -m)" if [ "$arch" = "i686" ]; then arch="i386" fi +if [ "$arch" = "arm64" ] || [ "$arch" = "aarch64" ]; then + arch="arm64" +fi if [ "$SERIAL" = "GPL" ]; then LOGIN="" PRODUCT="GPL" @@ -571,13 +574,13 @@ fi # Message to display in interactive mode install_msg() { supported=" ${CYANBG}${BLACK}${BOLD}Red Hat Enterprise Linux and derivatives${NORMAL}${CYAN} - - RHEL 8 and 9 on x86_64 - - Alma and Rocky 8 and 9 on x86_64 + - RHEL 8 and 9 on x86_64 and aarch64 + - Alma and Rocky 8 and 9 on x86_64 and aarch64 - CentOS 7 on x86_64${NORMAL} UNSTABLERHEL ${CYANBG}${BLACK}${BOLD}Debian Linux and derivatives${NORMAL}${CYAN} - - Debian 10 and 11 on i386 and amd64 - - Ubuntu 20.04 LTS and 22.04 LTS on i386 and amd64${NORMAL}" + - Debian 10 and 11 on i386, amd64 and arm64 + - Ubuntu 20.04 LTS and 22.04 LTS on i386, amd64 and arm64${NORMAL}" cat < Date: Sun, 8 Jan 2023 21:23:33 +0200 Subject: [PATCH 2/3] Fix to use `elif` statement to test for ARM system --- virtualmin-install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/virtualmin-install.sh b/virtualmin-install.sh index 8d0f3d0..02fdcac 100644 --- a/virtualmin-install.sh +++ b/virtualmin-install.sh @@ -292,8 +292,7 @@ fi arch="$(uname -m)" if [ "$arch" = "i686" ]; then arch="i386" -fi -if [ "$arch" = "arm64" ] || [ "$arch" = "aarch64" ]; then +elif [ "$arch" = "arm64" ] || [ "$arch" = "aarch64" ]; then arch="arm64" fi if [ "$SERIAL" = "GPL" ]; then From 4847f26947fc312a8b342bedf3033d64f00759b6 Mon Sep 17 00:00:00 2001 From: iliajie Date: Mon, 9 Jan 2023 00:44:28 +0200 Subject: [PATCH 3/3] Fix to mention CentOS 7 too (aarch64) --- virtualmin-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtualmin-install.sh b/virtualmin-install.sh index 02fdcac..c16f2e7 100644 --- a/virtualmin-install.sh +++ b/virtualmin-install.sh @@ -575,7 +575,7 @@ install_msg() { supported=" ${CYANBG}${BLACK}${BOLD}Red Hat Enterprise Linux and derivatives${NORMAL}${CYAN} - RHEL 8 and 9 on x86_64 and aarch64 - Alma and Rocky 8 and 9 on x86_64 and aarch64 - - CentOS 7 on x86_64${NORMAL} + - CentOS 7 on x86_64 and aarch64${NORMAL} UNSTABLERHEL ${CYANBG}${BLACK}${BOLD}Debian Linux and derivatives${NORMAL}${CYAN} - Debian 10 and 11 on i386, amd64 and arm64