From 39830d82a559a0cbfe1265dacd8e664af26d5b17 Mon Sep 17 00:00:00 2001 From: UriHerrera Date: Tue, 6 Feb 2024 17:46:47 -0600 Subject: [PATCH] [ci skip] OTA 3.21 -> 3.3.0 For more information see: https://nxos.org/changelog/release-announcement-nitrux-3-3-0/ --- debian/changelog | 4 ++-- tmp/nuts-cru | 4 ++-- tmp/nuts-query.info | 8 ++++---- usr/bin/nuts | 14 ++++++++++++-- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 76ac976..1fde38e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,7 @@ nuts (2.1.1) nitrux; urgency=medium nuts (2.1.0) nitrux; urgency=medium * Refactor nuts-cru (update component). - * Remove code to manage kernel from nuts-ccu, diver users to use Kernel Boot to add new kernels. + * Remove code to manage kernel from nuts-ccu, divert users to use Kernel Boot to add new kernels. * Add to toggle removing or keeping backups during updates. * Improve status messages. * When using self-update, display a message when there's no updates to apply. @@ -200,7 +200,7 @@ nuts (0.1.0) nitrux; urgency=medium nuts (0.0.9) nitrux; urgency=medium - * Check if ISO exists so it's not downloaded again. + * Check if ISO exists so it is not downloaded again. -- Uri Herrera Tue, 13 Jun 2023 01:47:00 -0500 diff --git a/tmp/nuts-cru b/tmp/nuts-cru index d3dc7b7..78f239a 100755 --- a/tmp/nuts-cru +++ b/tmp/nuts-cru @@ -352,8 +352,8 @@ puts_info "Updating ${CURRENT_DIST^}, continuing..." APPIMAGE_URL="https://github.com/UriHerrera/storage/raw/master/AppImages/dpkg-1.19.7-x86_64.AppImage" AIFILE_DL_PATH="/tmp/dpkg-1.19.7-x86_64.AppImage" AIPKG_MANAGER="/tmp/pkgman" -VAR_DATA_URL="https://raw.githubusercontent.com/Nitrux/storage/main/Other/var-lib-dpkg-3-2-0.tar.xz" -TARFILE_DL_PATH="/tmp/var-lib-dpkg-3-2-0.tar.xz" +VAR_DATA_URL="https://raw.githubusercontent.com/Nitrux/storage/main/Other/var-lib-dpkg-3-2-1.tar.xz" +TARFILE_DL_PATH="/tmp/var-lib-dpkg-3-2-1.tar.xz" if dl_file "$APPIMAGE_URL" > "$AIFILE_DL_PATH" && \ [[ $(file --mime-type -b "$AIFILE_DL_PATH") == "application/x-executable" ]] && \ diff --git a/tmp/nuts-query.info b/tmp/nuts-query.info index a299952..706887b 100644 --- a/tmp/nuts-query.info +++ b/tmp/nuts-query.info @@ -5,16 +5,16 @@ # Define the minimum target for the update. # [RELEASE] -MINTARGET=3.2.0 +MINTARGET=3.2.1 # Define the name of the file and its checksum. # [OTA] -OTAFILE=ota-2024.01.15-02.51-amd64.squashfs -OTASUM=d016bb8ca0a1f11e0afbd612c53392a6 +OTAFILE=ota-2024.02.06-00.49-amd64.squashfs +OTASUM=de1ef4d5219edd60b7f9599321395a37 # Define the list of mirrors to download the file. # If multiple mirrors are available, separate them using commas, i.e., url1,url2,url3 # [URL] -MIRRORLIST=https://master.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.01.15-02.51-amd64.squashfs,https://netactuate.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.01.15-02.51-amd64.squashfs,https://netix.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.01.15-02.51-amd64.squashfs,https://freefr.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.01.15-02.51-amd64.squashfs,https://phoenixnap.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.01.15-02.51-amd64.squashfs,https://ufpr.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.01.15-02.51-amd64.squashfs,https://liquidtelecom.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.01.15-02.51-amd64.squashfs,https://yer.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.01.15-02.51-amd64.squashfs,https://newcontinuum.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.01.15-02.51-amd64.squashfs,https://versaweb.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.01.15-02.51-amd64.squashfs +MIRRORLIST=https://master.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.02.06-00.49-amd64.squashfs,https://netactuate.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.02.06-00.49-amd64.squashfs,https://netix.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.02.06-00.49-amd64.squashfs,https://freefr.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.02.06-00.49-amd64.squashfs,https://phoenixnap.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.02.06-00.49-amd64.squashfs,https://ufpr.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.02.06-00.49-amd64.squashfs,https://liquidtelecom.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.02.06-00.49-amd64.squashfs,https://yer.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.02.06-00.49-amd64.squashfs,https://newcontinuum.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.02.06-00.49-amd64.squashfs,https://versaweb.dl.sourceforge.net/project/nitruxos/Updates/ota-2024.02.06-00.49-amd64.squashfs diff --git a/usr/bin/nuts b/usr/bin/nuts index 2d969b7..6132afc 100755 --- a/usr/bin/nuts +++ b/usr/bin/nuts @@ -199,6 +199,10 @@ spinner() { printf "\n" } +get_gpu_manufacturer() { + nvidia-smi -L | awk -F ' ' '$3=="NVIDIA"{print $3; exit}' +} + # -- Use a log file. # -- Everything below will go to the file nuts.log. @@ -219,6 +223,12 @@ TARGET_DIST="nitrux" # -- Flag parsing. +if [ "$(get_gpu_manufacturer)" == "NVIDIA" ]; then + puts_warning "NVIDIA hardware detected!. Due to how the NVIDIA proprietary driver works with the Linux kernel, OTA archives will not include updates to the proprietary driver." + puts_warning "NVIDIA users, please follow the alternative method described at https://nxos.org/tutorial/how-to-upgrade-nitrux/#upgrade-using-live-iso to update the distribution." +fi + + for cmd; do case "$cmd" in -h | --help ) @@ -240,10 +250,10 @@ for cmd; do " --keep-backups-on-update Defines whether the $TOOL_NAME deletes backups during the update process." \ "" \ "Operations:" \ - " update Update the currently installed root using the media specified in nuts-query and creates a backup of the current root directory." \ + " update Update the currently installed root using the archive specified in nuts-query and creates a backup of the current root directory." \ " restore Restore the backup of the root directory generated during the update." \ " rescue Restore the backup of the root partition in case of an interrupted update." \ - " self-update Update $TOOL_NAME and its configuration file using the default branch set in the configuration file." \ + " self-update Update the $TOOL_NAME and its configuration file using the branch set in the configuration file." \ "" \ "Usage:" \ " sudo nuts (operation)" \