Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvements and cleanups #70

Merged
merged 4 commits into from
Aug 24, 2024
Merged

Improvements and cleanups #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c8d168
Remove non-working commands related to device-quirks
NeroReflex Aug 22, 2024
2c974bd
Fix frzr-autoupdate service
NeroReflex Aug 22, 2024
5a5bb4b
Handle download failure
NeroReflex Aug 22, 2024
a3b6343
Remove documentation for removed functions
NeroReflex Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion __frzr-deploy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,13 @@ frzr_deploy() {
sleep 1;
done
elif [ "${SHOW_UI}" = "0" ]; then
curl --http1.1 -L -o "${IMG_FILE}" -C - "${IMG_URL}"
if ! curl --http1.1 -L -o "${IMG_FILE}" -C - "${IMG_URL}"; then
TASK_ERROR=1
TASK_ERROR_MSG="Download failed"
STATE="FAIL"
send_data
continue
fi
else
TASK_MSG="Using Whiptail to show download progress"
send_data
Expand Down
6 changes: 0 additions & 6 deletions frzr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ frzr unlock (deployment) [Unlock the specified deployment, or the running one if
frzr set-channel [Set the update channel stable/testing/unstable]
frzr get-channel [Get the update channel currently in use]
frzr version [Get the version of FRZR]
frzr build-initramfs [Build the initramfs for the kernel]
frzr configure-tweaks [Configure system specific quirks]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How are we planning to enable/disable firmware overrides on the installer without this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Device-quirks PR has the functionality. It will be invoked on migrations inside a chroot. See here: https://github.com/ChimeraOS/chimeraos/blob/master/rootfs/usr/lib/frzr.d/install-0007-device-quirks-apply.migration

frzr bootstrap [Format and configure a drive to be used with FRZR]

[Environment]
Expand Down Expand Up @@ -268,10 +266,6 @@ elif [ $function == "get-channel" ]; then
echo "get-channel"
#TODO create frzr-channel to get target channel
#echo ${FRZR_ROOT}/source
elif [ $function == "build-initramfs" ]; then
source frzr-initramfs
elif [ $function == "configure-tweaks" ]; then
source frzr-tweaks
elif [ $function == "package-options" ]; then
#User selected packages to be added to the install
source frzr-extras
Expand Down
3 changes: 2 additions & 1 deletion frzr-autoupdate.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Wants=network-online.target

[Service]
Type=oneshot
ExecStart=frzr-deploy
Environment="SHOW_UI=0"
ExecStart=frzr deploy
RemainAfterExit=false
StandardOutput=journal
Loading