Skip to content

autoinstall-terminal: fail on error instead of reporting a false success #268

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

Open
T2an wants to merge 1 commit into
base: main
Choose a base branch
from
Open

autoinstall-terminal: fail on error instead of reporting a false success #268

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 22 additions & 9 deletions lib/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,22 +382,35 @@ rec {
log_error "/mnt is not a mountpoint or resides on a /tmpfs. The installation cannot succeed. Exiting."
exit 1
fi
${optionalString createSecureBootKeys createSecureBootKeysScript}
box_message "Burning the image on ${mainDisk}..."
${installProcedureScript config}
${optionalString enrollSecureBootKeys secureBootEnrollmentScript}
${optionalString (preprovisionOptions.tpm2HostKeys or false) tpm2ProvisionScript}
${optionalString (preprovisionOptions.ageHostKeys or false) ageKeysProvisionScript}
${postInstallScript}
lsblk
log_info "Installation is complete. You can now reboot in the installed system."
(
set -e
${optionalString createSecureBootKeys createSecureBootKeysScript}
box_message "Burning the image on ${mainDisk}..."
${installProcedureScript config}
${optionalString enrollSecureBootKeys secureBootEnrollmentScript}
${optionalString (preprovisionOptions.tpm2HostKeys or false) tpm2ProvisionScript}
${optionalString (preprovisionOptions.ageHostKeys or false) ageKeysProvisionScript}
${postInstallScript}
)
INSTALL_FAILED=$?
if [ "$INSTALL_FAILED" -ne 0 ]; then
log_error "Installation failed."
box_message "Installation aborted: see /tmp/install.log for details."
else
lsblk
log_info "Installation is complete. You can now reboot in the installed system."
fi

if [ -f "$INSTALL_LOG" ]; then
mkdir -p /mnt/var/log
cp "$INSTALL_LOG" /mnt/var/log/securix-install.log
log_info "Install log saved to /var/log/securix-install.log on the target system."
fi

if [ "$INSTALL_FAILED" -ne 0 ]; then
exit 1
fi

'')
];
}
Expand Down
Loading