From 5a69b3d460ae00d8411d7e4709c667765b59036c Mon Sep 17 00:00:00 2001 From: t3chn0m4g3 Date: Tue, 12 Aug 2025 20:26:05 +0200 Subject: [PATCH] Fix links and add support for Debian 13 --- README.md | 4 ++-- install.sh | 24 +++++++++++++++--------- uninstall.sh | 24 +++++++++++++++--------- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 85c5ef37..505cef7b 100644 --- a/README.md +++ b/README.md @@ -326,11 +326,11 @@ Once you are familiar with how things work you should choose a network you suspe | Distribution Name | x64 | arm64 | | :--------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------ | :-------------------------------------------------------------------------------------------------------------------------------------- | | [Alma Linux OS 9.6 Boot ISO](https://almalinux.org) | [download](https://repo.almalinux.org/almalinux/9.6/isos/x86_64/AlmaLinux-9.6-x86_64-boot.iso) | [download](https://repo.almalinux.org/almalinux/9.6/isos/aarch64/AlmaLinux-9.6-aarch64-boot.iso) | -| [Debian 12 Network Install](https://www.debian.org/CD/netinst/index.en.html) | [download](https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-12.11.0-amd64-netinst.iso) | [download](https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-12.11.0-arm64-netinst.iso) | +| [Debian 13 Network Install](https://www.debian.org/CD/netinst/index.en.html) | [download](https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-13.0.0-amd64-netinst.iso) | [download](https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.0.0-arm64-netinst.iso) | | [Fedora Server 42 Network Install](https://fedoraproject.org/server/download) | [download](https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/iso/Fedora-Server-netinst-x86_64-42-1.1.iso) | [download](https://download.fedoraproject.org/pub/fedora/linux/releases/42/Server/aarch64/iso/Fedora-Server-netinst-aarch64-42-1.1.iso) | | [OpenSuse Tumbleweed Network Image](https://get.opensuse.org/tumbleweed/#download) | [download](https://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-x86_64-Current.iso) | [download](https://download.opensuse.org/ports/aarch64/tumbleweed/iso/openSUSE-Tumbleweed-NET-aarch64-Current.iso) | | [Rocky Linux OS 9.6 Boot ISO](https://rockylinux.org/download) | [download](https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.6-x86_64-minimal.iso) | [download](https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.6-aarch64-minimal.iso) | -| [Ubuntu 24.04.2 Live Server](https://ubuntu.com/download/server) | [download](https://releases.ubuntu.com/24.04/ubuntu-24.04.2-live-server-amd64.iso) | [download](https://cdimage.ubuntu.com/releases/24.04/release/ubuntu-24.04.2-live-server-arm64.iso) | +| [Ubuntu 24.04.3 Live Server](https://ubuntu.com/download/server) | [download](https://releases.ubuntu.com/24.04/ubuntu-24.04.3-live-server-amd64.iso) | [download](https://cdimage.ubuntu.com/releases/24.04/release/ubuntu-24.04.3-live-server-arm64.iso) |
diff --git a/install.sh b/install.sh index 84057118..08479c12 100755 --- a/install.sh +++ b/install.sh @@ -206,17 +206,23 @@ if [ ! -f installer/install/tpot.yml ] && [ ! -f tpot.yml ]; fi # Check type of sudo access -sudo -n true > /dev/null 2>&1 -if [ $? -eq 1 ]; +if myANSIBLE_TAG="Debian"; + # Debian 13 - sudo seems to apply stricter settings, we now ask for the become password then - myANSIBLE_BECOME_OPTION="--ask-become-pass" - echo "### ‘sudo‘ not acquired, setting ansible become option to ${myANSIBLE_BECOME_OPTION}." - echo "### Ansible will ask for the ‘BECOME password‘ which is typically the password you ’sudo’ with." - echo + myANSIBLE_BECOME_OPTION="--become --ask-become-pass" else - myANSIBLE_BECOME_OPTION="--become" - echo "### ‘sudo‘ acquired, setting ansible become option to ${myANSIBLE_BECOME_OPTION}." - echo + sudo -n true > /dev/null 2>&1 + if [ $? -eq 1 ]; + then + myANSIBLE_BECOME_OPTION="--ask-become-pass" + echo "### ‘sudo‘ not acquired, setting ansible become option to ${myANSIBLE_BECOME_OPTION}." + echo "### Ansible will ask for the ‘BECOME password‘ which is typically the password you ’sudo’ with." + echo + else + myANSIBLE_BECOME_OPTION="--become" + echo "### ‘sudo‘ acquired, setting ansible become option to ${myANSIBLE_BECOME_OPTION}." + echo + fi fi # Run Ansible Playbook diff --git a/uninstall.sh b/uninstall.sh index f1f9f00f..c5741e42 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -63,17 +63,23 @@ if [[ "${myANSIBLE_DISTRIBUTIONS[@]}" =~ "${myCURRENT_DISTRIBUTION}" ]]; fi # Check type of sudo access -sudo -n true > /dev/null 2>&1 -if [ $? -eq 1 ]; +if myANSIBLE_TAG="Debian"; + # Debian 13 - sudo seems to apply stricter settings, we now ask for the become password then - myANSIBLE_BECOME_OPTION="--ask-become-pass" - echo "### ‘sudo‘ not acquired, setting ansible become option to ${myANSIBLE_BECOME_OPTION}." - echo "### Ansible will ask for the ‘BECOME password‘ which is typically the password you ’sudo’ with." - echo + myANSIBLE_BECOME_OPTION="--become --ask-become-pass" else - myANSIBLE_BECOME_OPTION="--become" - echo "### ‘sudo‘ acquired, setting ansible become option to ${myANSIBLE_BECOME_OPTION}." - echo + sudo -n true > /dev/null 2>&1 + if [ $? -eq 1 ]; + then + myANSIBLE_BECOME_OPTION="--ask-become-pass" + echo "### ‘sudo‘ not acquired, setting ansible become option to ${myANSIBLE_BECOME_OPTION}." + echo "### Ansible will ask for the ‘BECOME password‘ which is typically the password you ’sudo’ with." + echo + else + myANSIBLE_BECOME_OPTION="--become" + echo "### ‘sudo‘ acquired, setting ansible become option to ${myANSIBLE_BECOME_OPTION}." + echo + fi fi # Run Ansible Playbook