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.

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

improve error handling #231

Closed
wants to merge 23 commits into from
Closed

improve error handling #231

wants to merge 23 commits into from

Conversation

adrelanos
Copy link
Contributor

WIP

Not yet tested. Will test soon.

My commit messages are more explanatory for the reviewer than useful in the git history of the master branch.

Due the difficulty and extensive scope of these changes, I won't be able to split this into different logical sets of changes. It was so extensive, I had to randomly start somewhere and adjust it step by step for the new error handler.

I would suggest to squash all of these commits into a single commit since functionality wise hopefully nothing changed, just the error handling was improved and the code simplified.

Fixes #224

@adrelanos adrelanos changed the title Error handling improve error handling Oct 25, 2023
INITRD=No is also supported by other scripts
because it will not always work

will not work in cases where /dev etc is still mounted inside the chroot
@adrelanos
Copy link
Contributor Author

This is now tested with --vmefi. Images are bootable.

@adrelanos
Copy link
Contributor Author

This was used to build Kicksecure and Whonix VM images. Seems stable. No issues.

@zeha
Copy link
Member

zeha commented Nov 17, 2023

This seems to break in some situations, example: https://github.com/zeha/grml-debootstrap/actions/runs/6906107865/job/18790415343

If you rebase this branch on top of current master, it should also get an actions pipeline.

@adrelanos
Copy link
Contributor Author

I created a branch error-handling2 because I wasn't sure if I should force push or if I messed up the rebase.

@adrelanos
Copy link
Contributor Author

Seems a lot easier to rebase using github "Resolve conflicts" button than what I did locally:

  1. git fetch grml
  2. git checkout error-handling
  3. git rebase grml-master
  4. git mergetool

(Which is a 3 way diff using meld.)

A lot things I resolved manually I was wondering why git failed to merge this automatically.

Any hints for a better process?

@adrelanos adrelanos closed this by deleting the head repository Nov 22, 2023
This was referenced Nov 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

error not caught
2 participants