Skip to content

initrd: replace all direct killall with release_scdaemon - #2170

Merged
tlaurion merged 1 commit into
linuxboot:masterfrom
tlaurion:fix-oemreset-nk-storage
Jul 29, 2026
Merged

initrd: replace all direct killall with release_scdaemon#2170
tlaurion merged 1 commit into
linuxboot:masterfrom
tlaurion:fix-oemreset-nk-storage

Conversation

@tlaurion

Copy link
Copy Markdown
Collaborator

Supersedes #2167.

  • oem-factory-reset.sh: add release_scdaemon after NK Storage AES key reset
    to release CCID lock (fixes regression from eb84f1b)
  • oem-factory-reset.sh: replace inline killall at top of main with release_scdaemon
  • seal-hotpkey.sh: replace inline killall with DO_WITH_DEBUG release_scdaemon
  • No direct killall to gpg-agent/scdaemon remains outside release_scdaemon body

Copilot AI review requested due to automatic review settings July 28, 2026 19:58

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Copilot wasn't able to review any files in this pull request.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

- oem-factory-reset.sh: add release_scdaemon after NK Storage AES key reset
  to release CCID lock (fixes regression from eb84f1b)
- oem-factory-reset.sh: replace inline killall at top of main with release_scdaemon
- seal-hotpkey.sh: replace inline killall with DO_WITH_DEBUG release_scdaemon
- No direct killall to gpg-agent/scdaemon remains outside release_scdaemon body

Signed-off-by: nestire <hannes@nitrokey.com>
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
@tlaurion
tlaurion force-pushed the fix-oemreset-nk-storage branch from ae131de to a887aae Compare July 28, 2026 20:00
@tlaurion

Copy link
Copy Markdown
Collaborator Author

@nestire please review. LGTM

@nestire nestire left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM Test full OEM Factory Reset with v54 + Nitrokey Storage everything worked as expected, Thx

@tlaurion
tlaurion merged commit 7f00d9b into linuxboot:master Jul 29, 2026
55 checks passed
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.

3 participants