Skip to content

Commit

Permalink
[ci skip] OTA 3.21 -> 3.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
UriHerrera committed Feb 6, 2024
1 parent e602fcf commit 39830d8
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 10 deletions.
4 changes: 2 additions & 2 deletions debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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 <uri_herrera@nxos.org> Tue, 13 Jun 2023 01:47:00 -0500

Expand Down
4 changes: 2 additions & 2 deletions tmp/nuts-cru
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]] && \
Expand Down
8 changes: 4 additions & 4 deletions tmp/nuts-query.info
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 12 additions & 2 deletions usr/bin/nuts
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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 )
Expand All @@ -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 <flag> (operation)" \
Expand Down

0 comments on commit 39830d8

Please sign in to comment.