Repository navigation
Conversation
omarchy-hibernation-setup writes /etc/limine-entry-tool.d/resume.conf with resume= and resume_offset=, but removal left it behind, so the next boot image still told the kernel to resume from a deleted swapfile. Setup only writes that file when it is missing, so setting hibernation up again kept the old offset while the new swapfile sat elsewhere, and resume silently lost the session. Removal now deletes the file before regenerating the boot image. Fixes omacom#13583 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Contributor
Author
|
Closing as a duplicate of #13584, which landed a few minutes earlier with the same fix and a test. Sorry for the noise. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #13583.
omarchy-hibernation-setupwrites/etc/limine-entry-tool.d/resume.conf(resume=… resume_offset=…).omarchy-hibernation-removedeleted the swapfile, the/swapsubvolume, the fstab entry and the mkinitcpio resume hook, but not that file. So:resume=andresume_offset=for a swapfile that no longer existsresume.confwhen it's missing (if [[ ! -f $RESUME_DROP_IN ]]), so setting hibernation up again keeps the old offset while the new swapfile sits elsewhere, and resume silently loses the sessionRemoval now deletes
resume.conf, right after the resume hook and beforelimine-mkinitcpio.This leaves
rtc-alarm.confand the keyboard-backlight sleep hook in place. As the issue notes, both are harmless without hibernation, and changing them would be a separate decision.Testing
test/shell.d/hibernation-remove-test.shruns the real script with/etcand/swappointed into a temp dir, andsudo,gum,swapon,btrfsandlimine-mkinitcpiostubbed. It checks that the hook andresume.confare gone before the boot image is regenerated. Onquattroit fails withhibernation remove drops the resume kernel parameters../test/cli: the one failure (vscode generated theme references current theme file) is the same onquattrowithout this change.I didn't run a real hibernation setup and remove cycle, since that rewrites the test machine's boot configuration.
🤖 Generated with Claude Code