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

oem-factory-reset: remove duplicates and add proper error redirection to file #1356

Merged
merged 1 commit into from
Mar 30, 2023

Conversation

tlaurion
Copy link
Collaborator

  • Trace calls need to happen after sourcing /etc/functions not before
  • Move sourcing of external files at beginning of file, remove /etc/functions sourcing duplicate
  • gpg error redirection was sent to /dev/null where expected to be added to whiptail in case of error (2>&1 instead and redirection to file)

@tlaurion
Copy link
Collaborator Author

@danielp96 if you see this and can test this would be nice, pretty trivial changes but still bugfixes
@JonathonHall-Purism otherwise next week!

@danielp96
Copy link
Contributor

danielp96 commented Mar 29, 2023

@tlaurion Tested OEM factory reset on a Librem 14, everything working fine.
Anything specific to test?

@tlaurion
Copy link
Collaborator Author

tlaurion commented Mar 30, 2023

@danielp96 Purely esthetic. Useful only when trying to bump gpg toolstack and when gpg screenscraping fails, to see gpg error trace which is expected to be under file, taken as input from whiptail to show on screen, helping us finding discrepencies from comand line input and from fd (yes: those are different....)

Rebasing on master with @ThePlexus fix #1357 and merging

… to file

- Trace calls need to happen after sourcing /etc/functions not before
- Move sourcing of external files at beginning of file, remove /etc/functions sourcing duplicate
- gpg error redirection was sent to /dev/null where expected to be added to whiptail in case of error (2>&1 instead and redirection to file)
@tlaurion tlaurion force-pushed the oem-factory-reset_clean branch from 0ff323a to 65b81e6 Compare March 30, 2023 17:15
@tlaurion tlaurion merged commit 0be5b1b into linuxboot:master Mar 30, 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.

2 participants