Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 1a111de
Author: UriHerrera <[email protected]>
Date:   Fri May 3 15:50:38 2024 -0600

    Update nuts

commit b6e1f8e
Author: UriHerrera <[email protected]>
Date:   Fri May 3 15:46:19 2024 -0600

    Update README.md

commit 300eda1
Author: UriHerrera <[email protected]>
Date:   Fri May 3 15:19:09 2024 -0600

    test ota

commit 7514afe
Author: UriHerrera <[email protected]>
Date:   Fri May 3 13:50:56 2024 -0600

    test ota

commit bfa470f
Author: UriHerrera <[email protected]>
Date:   Fri May 3 02:38:49 2024 -0600

    test ota

commit a7edb56
Author: UriHerrera <[email protected]>
Date:   Thu May 2 23:43:18 2024 -0600

    disable xtrace

commit 42b6223
Author: UriHerrera <[email protected]>
Date:   Thu May 2 22:04:20 2024 -0600

    wtf now

commit f14b067
Author: UriHerrera <[email protected]>
Date:   Thu May 2 21:59:15 2024 -0600

    use raw url for appimage

commit 52dc70d
Author: UriHerrera <[email protected]>
Date:   Thu May 2 21:48:49 2024 -0600

    fix variable

commit 2272ac2
Author: UriHerrera <[email protected]>
Date:   Thu May 2 21:43:14 2024 -0600

    ...

commit d5d3e3b
Author: UriHerrera <[email protected]>
Date:   Thu May 2 21:42:00 2024 -0600

    use mintarget to get var data

commit 315d3ba
Author: UriHerrera <[email protected]>
Date:   Thu May 2 21:26:48 2024 -0600

    ffs

commit 9d0be77
Author: UriHerrera <[email protected]>
Date:   Thu May 2 20:15:41 2024 -0600

    test ota

commit f189140
Author: UriHerrera <[email protected]>
Date:   Wed May 1 23:53:12 2024 -0600

    test ota

commit f93ff56
Author: UriHerrera <[email protected]>
Date:   Wed May 1 02:36:36 2024 -0600

    chk this

commit a233fd8
Author: UriHerrera <[email protected]>
Date:   Wed May 1 00:37:54 2024 -0600

    rm this

commit 91f0a68
Author: UriHerrera <[email protected]>
Date:   Tue Apr 30 17:23:44 2024 -0600

    fx typo

commit 8a0324c
Author: UriHerrera <[email protected]>
Date:   Tue Apr 30 16:56:48 2024 -0600

    add more misc fixes

    - create dir for os-prober
    - rm services

commit 6d8b487
Author: UriHerrera <[email protected]>
Date:   Tue Apr 30 16:10:27 2024 -0600

    update copyright dates

commit 0a050c6
Author: UriHerrera <[email protected]>
Date:   Tue Apr 30 16:04:20 2024 -0600

    mount devtmpfs b4 executing components

    because apparently that's a thing we need to do now?

commit bad566f
Author: UriHerrera <[email protected]>
Date:   Tue Apr 30 15:57:33 2024 -0600

    test creating empty file first

commit 81e0bee
Author: UriHerrera <[email protected]>
Date:   Tue Apr 30 15:50:52 2024 -0600

    add chk so that the main component doesn't exit abruptly

commit 072bfb1
Author: UriHerrera <[email protected]>
Date:   Tue Apr 30 15:29:24 2024 -0600

    test ota

commit 1922d20
Author: UriHerrera <[email protected]>
Date:   Tue Apr 30 02:19:43 2024 -0600

    test ota
  • Loading branch information
UriHerrera committed May 4, 2024
1 parent 4511f5d commit a210a8b
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 23 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,19 @@ sudo cp $HOME/nuts/etc/nuts.conf /etc
# Usage

`nuts` is designed to be highly autonomous.
- _♦ Information: The use of this utility requires `sudo`_
> _♦ Information: The use of this utility requires `sudo`_
### Commands:

**Update**: `nuts update`
- Updates the currently installed root using the specified media in `nuts-query` and backs up the current root directory and partition.
- Updates the currently installed root using the specified archive in `nuts-query` and backs up the current root directory and partition.

**Restore**: `nuts restore`
- Restores the backup of the root directory generated during the update.

**Rescue**: `nuts rescue`
- Restores the backup of the XFS root partition in case of an interrupted update.
- _♦ Information: This operation is a special handling of an unforeseen event. If the update process were interrupted, the root would be inconsistent. That means the root is unusable, i.e., the user can't access the GUI or, worse, a TTY, so the user can't restore the SquashFS. This operation will allow the user to restore the root partition from a Live session. This operation does not replace `restore`; it exists if using `restore` is impossible. The user can only use this operation from a Live session._
>_♦ Information: This operation is a special handling of an unforeseen event. If the update process were interrupted, the root would be inconsistent. That means the root is unusable, i.e., the user can't access the GUI or, worse, a TTY, so the user can't restore the SquashFS. This operation will allow the user to restore the root partition from a Live session. This operation does not replace `restore`; it exists if using `restore` is impossible. The user can only use this operation from a Live session._
**Self-update**: `nuts self-update`
- Updates `nuts` and its configuration file using the default branch set in the configuration file.
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
nuts (2.1.4) nitrux; urgency=medium

* Mount devtmpfs before running the components in the overlay.

-- Uri Herrera <[email protected]> Sat, 04 May 2024 01:42:00 -0500

nuts (2.1.3) nitrux; urgency=medium

* Add warning when detecting NVIDIA hardware.
Expand Down
30 changes: 22 additions & 8 deletions tmp/nuts-ccu
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@ spinner() {
# Also link the library files for cask to launch because maui-shell and cask-server used Jammy for compilation, and the frameworks used Debian.
# KDE PIM libraries were renamed to different SO names because of course they were. Update the links on every new KF5 release.

KDEPIM_LIB="5.24.5"
KF5_LIB="5.114.0"
# KDEPIM_LIB="5.24.5"
# KF5_LIB="5.114.0"

create_symlink /usr/lib/x86_64-linux-gnu/libKPim5EventViews.so.$KDEPIM_LIB /usr/lib/x86_64-linux-gnu/libKF5EventViews.so.5abi1
create_symlink /usr/lib/x86_64-linux-gnu/libKPim5CalendarSupport.so.$KDEPIM_LIB /usr/lib/x86_64-linux-gnu/libKF5CalendarSupport.so.5abi1
create_symlink /usr/lib/x86_64-linux-gnu/libKPim5AkonadiCalendar.so.$KDEPIM_LIB /usr/lib/x86_64-linux-gnu/libKF5AkonadiCalendar.so.5abi1
create_symlink /usr/lib/x86_64-linux-gnu/libKPim5AkonadiWidgets.so.$KDEPIM_LIB /usr/lib/x86_64-linux-gnu/libKF5AkonadiWidgets.so.5abi1
create_symlink /usr/lib/x86_64-linux-gnu/libKPim5AkonadiCore.so.$KDEPIM_LIB /usr/lib/x86_64-linux-gnu/libKF5AkonadiCore.so.5abi2
create_symlink /usr/lib/x86_64-linux-gnu/libKF5CalendarCore.so.$KF5_LIB /usr/lib/x86_64-linux-gnu/libKF5CalendarCore.so.5abi2
# create_symlink /usr/lib/x86_64-linux-gnu/libKPim5EventViews.so.$KDEPIM_LIB /usr/lib/x86_64-linux-gnu/libKF5EventViews.so.5abi1
# create_symlink /usr/lib/x86_64-linux-gnu/libKPim5CalendarSupport.so.$KDEPIM_LIB /usr/lib/x86_64-linux-gnu/libKF5CalendarSupport.so.5abi1
# create_symlink /usr/lib/x86_64-linux-gnu/libKPim5AkonadiCalendar.so.$KDEPIM_LIB /usr/lib/x86_64-linux-gnu/libKF5AkonadiCalendar.so.5abi1
# create_symlink /usr/lib/x86_64-linux-gnu/libKPim5AkonadiWidgets.so.$KDEPIM_LIB /usr/lib/x86_64-linux-gnu/libKF5AkonadiWidgets.so.5abi1
# create_symlink /usr/lib/x86_64-linux-gnu/libKPim5AkonadiCore.so.$KDEPIM_LIB /usr/lib/x86_64-linux-gnu/libKF5AkonadiCore.so.5abi2
# create_symlink /usr/lib/x86_64-linux-gnu/libKF5CalendarCore.so.$KF5_LIB /usr/lib/x86_64-linux-gnu/libKF5CalendarCore.so.5abi2


# Add link for applet window buttons.
Expand Down Expand Up @@ -238,6 +238,20 @@ done

puts_success "Success! misc. and configuration files have been updated, continuing..."


# -- Create directory for os-prober.

mkdir -p /var/lib/os-prober/mount


# -- Remove uneeded services from OpenRC runlevels.

rc-update del plymouth default
rc-update del tor default

rc-update -u


######################################################
# End of misc-fixes and edit-conf from iso-tool #
######################################################
Expand Down
9 changes: 6 additions & 3 deletions tmp/nuts-cru
Original file line number Diff line number Diff line change
Expand Up @@ -346,14 +346,17 @@ mount "$NUTS_DIR_DLS"/nuts-ota.squashfs "$NUTS_DIR_SQS"


# -- Now comes the good part; update the current installation.
# -- Specify data archive when upgrading using the same version set as the minimum target in nuts-query.

puts_info "Updating ${CURRENT_DIST^}, continuing..."

APPIMAGE_URL="https://github.com/UriHerrera/storage/raw/master/AppImages/dpkg-1.19.7-x86_64.AppImage"
APPIMAGE_URL="https://raw.githubusercontent.com/UriHerrera/storage/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-1.tar.xz"
TARFILE_DL_PATH="/tmp/var-lib-dpkg-3-2-1.tar.xz"

VAR_DATA_TARGET="3.4.0"
VAR_DATA_URL="https://raw.githubusercontent.com/Nitrux/storage/master/Other/var-lib-dpkg-$VAR_DATA_TARGET.tar.xz"
TARFILE_DL_PATH="/tmp/var-lib-dpkg-$VAR_DATA_TARGET.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.1
MINTARGET=3.4.0

# Define the name of the file and its checksum.
#
[OTA]
OTAFILE=ota-2024.02.06-00.49-amd64.squashfs
OTASUM=de1ef4d5219edd60b7f9599321395a37
OTAFILE=ota-2024.05.03-15.18-amd64.squashfs
OTASUM=b0d5d81ddacd377fe2343ae07abb780f

# 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.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
MIRRORLIST=https://master.dl.sourceforge.net/project/nitruxos/Testing/ota-2024.05.03-15.18-amd64.squashfs,https://netactuate.dl.sourceforge.net/project/nitruxos/Testing/ota-2024.05.03-15.18-amd64.squashfs,https://netix.dl.sourceforge.net/project/nitruxos/Testing/ota-2024.05.03-15.18-amd64.squashfs,https://freefr.dl.sourceforge.net/project/nitruxos/Testing/ota-2024.05.03-15.18-amd64.squashfs,https://phoenixnap.dl.sourceforge.net/project/nitruxos/Testing/ota-2024.05.03-15.18-amd64.squashfs,https://ufpr.dl.sourceforge.net/project/nitruxos/Testing/ota-2024.05.03-15.18-amd64.squashfs,https://liquidtelecom.dl.sourceforge.net/project/nitruxos/Testing/ota-2024.05.03-15.18-amd64.squashfs,https://yer.dl.sourceforge.net/project/nitruxos/Testing/ota-2024.05.03-15.18-amd64.squashfs,https://newcontinuum.dl.sourceforge.net/project/nitruxos/Testing/ota-2024.05.03-15.18-amd64.squashfs,https://versaweb.dl.sourceforge.net/project/nitruxos/Testing/ota-2024.05.03-15.18-amd64.squashfs
13 changes: 8 additions & 5 deletions usr/bin/nuts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#############################################################################################################################################################################
# The license used for this file and its contents is: BSD-3-Clause #
# #
# Copyright <2023> <Uri Herrera <[email protected]>> #
# Copyright <2023-2024> <Uri Herrera <[email protected]>> #
# Copyright <2023> <Luis Lavaire <[email protected]>> #
# #
# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: #
Expand Down Expand Up @@ -274,7 +274,7 @@ for cmd; do
"" \
"Authors:" \
"" \
" Copyright <2023> <Uri Herrera <[email protected]>>" \
" Copyright <2023-2024> <Uri Herrera <[email protected]>>" \
" Copyright <2023> <Luis Lavaire <[email protected]>>" \
"" \
"(c) $FECHA Some Rights Reserved. Made by $VENDOR"
Expand Down Expand Up @@ -383,9 +383,9 @@ done
dl_file "https://raw.githubusercontent.com/Nitrux/nuts/$NUTS_BRANCH/tmp/nuts-query.info" > /dev/null 2>&1


# -- Make a comparison of the current installation version against the minimum target for upgrade.
# -- This way, we know that the user is running this tool on an installation that we can upgrade; thus, this tool works as intended.
# -- If the check matches, it means there's an update.
# -- Make a comparison of the current installation version against the minimum target for upgrade.
# -- This way, we know that the user is running this tool on an installation that we can upgrade; thus, this tool works as intended.
# -- If the check matches, it means there's an update.
# -- if the check doesn't match, it means there's no update.
# -- Comparing the checksum of /installed_pkgs_end.txt to verify versions is now deprecated.

Expand Down Expand Up @@ -472,6 +472,7 @@ done
# -- Always download the latest component. The component will remain in the filesystem after using it; however, once the user executes this <operation> again, it will be deleted and re-downloaded.
# -- Download nuts-query.info to the chroot because we initially downloaded it to the overlay.

overlay_ch mount -t devtmpfs dev /dev
overlay_ch find /usr/bin -type f -name "nuts-cru" -exec rm {} \;
overlay_ch axel -o /usr/bin -c -n 10 "https://raw.githubusercontent.com/Nitrux/nuts/$NUTS_BRANCH/tmp/nuts-cru" > /dev/null 2>&1
overlay_ch chmod +x /usr/bin/nuts-cru
Expand Down Expand Up @@ -532,6 +533,7 @@ done
# -- Run nuts-crr to perform the restore actions inside the chroot.
# -- Always download the latest component. The component will remain in the filesystem after using it; however, once the user executes this <operation> again, it will be deleted and re-downloaded.

overlay_ch mount -t devtmpfs dev /dev
overlay_ch find /usr/bin -type f -name "nuts-crr" -exec rm {} \;
overlay_ch axel -o /usr/bin -c -n 10 "https://raw.githubusercontent.com/Nitrux/nuts/$NUTS_BRANCH/tmp/nuts-crr" > /dev/null 2>&1
overlay_ch chmod +x /usr/bin/nuts-crr
Expand Down Expand Up @@ -691,6 +693,7 @@ done
# -- This also updates the configuration file.
# -- Always download the latest component. The component will remain in the filesystem after using it; however, once the user executes this <operation> again, it will be deleted and re-downloaded.

overlay_ch mount -t devtmpfs dev /dev
overlay_ch find /usr/bin -type f -name "nuts-sup" -exec rm {} \;
overlay_ch axel -o /usr/bin -c -n 10 "https://raw.githubusercontent.com/Nitrux/nuts/$NUTS_BRANCH/tmp/nuts-sup" > /dev/null 2>&1
overlay_ch chmod +x /usr/bin/nuts-sup
Expand Down

0 comments on commit a210a8b

Please sign in to comment.