Skip to content

Drop the resume kernel parameters when removing hibernation #13587

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

Closed
manuaudio wants to merge 1 commit into from
+40 −0
Closed

Drop the resume kernel parameters when removing hibernation #13587

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions bin/omarchy-hibernation-remove
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# omarchy:requires-sudo=true

MKINITCPIO_CONF="/etc/mkinitcpio.conf.d/omarchy_resume.conf"
RESUME_DROP_IN="/etc/limine-entry-tool.d/resume.conf"

# Check if hibernation is configured
if [[ ! -f $MKINITCPIO_CONF ]] || ! grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF"; then
Expand Down Expand Up @@ -48,6 +49,13 @@ fi
echo "Removing resume hook"
sudo rm "$MKINITCPIO_CONF"

# Remove the resume kernel parameters. Setup only writes them when the file is
# missing, so a leftover would pin a later setup to this swapfile's old offset.
if [[ -f $RESUME_DROP_IN ]]; then
echo "Removing resume kernel parameters"
sudo rm "$RESUME_DROP_IN"
fi

echo "Regenerating initramfs..."
sudo limine-mkinitcpio

Expand Down
32 changes: 32 additions & 0 deletions test/shell.d/hibernation-remove-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/bin/bash

set -euo pipefail

source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"

tmp=$(mktemp -d)
trap 'rm -rf "$tmp"' EXIT
mkdir -p "$tmp/bin" "$tmp/etc/mkinitcpio.conf.d" "$tmp/etc/limine-entry-tool.d" "$tmp/swap"

# Run the real script against a sandboxed /etc and /swap, with the privileged
# and interactive tools stubbed out.
sed -e "s|/etc/|$tmp/etc/|g" -e "s|\"/swap\"|\"$tmp/swap\"|" "$ROOT/bin/omarchy-hibernation-remove" >"$tmp/remove"
printf '#!/bin/bash\n"$@"\n' >"$tmp/bin/sudo"
printf '#!/bin/bash\nexit 0\n' >"$tmp/bin/gum"
printf '#!/bin/bash\nexit 0\n' >"$tmp/bin/swapon"
printf '#!/bin/bash\nexit 1\n' >"$tmp/bin/btrfs"
printf '#!/bin/bash\ntouch "%s/regenerated"\n' "$tmp" >"$tmp/bin/limine-mkinitcpio"
chmod +x "$tmp/bin/"*

echo 'HOOKS+=(resume)' >"$tmp/etc/mkinitcpio.conf.d/omarchy_resume.conf"
echo 'KERNEL_CMDLINE[default]+=" resume=/dev/mapper/root resume_offset=1929151"' >"$tmp/etc/limine-entry-tool.d/resume.conf"
touch "$tmp/swap/swapfile" "$tmp/etc/fstab"

PATH="$tmp/bin:$PATH" bash "$tmp/remove" >/dev/null

[[ ! -e $tmp/etc/mkinitcpio.conf.d/omarchy_resume.conf ]] || fail "hibernation remove drops the resume hook"
# Setup only writes resume.conf when it is missing, so a leftover would pin a
# later setup to the deleted swapfile's offset.
[[ ! -e $tmp/etc/limine-entry-tool.d/resume.conf ]] || fail "hibernation remove drops the resume kernel parameters"
[[ -e $tmp/regenerated ]] || fail "hibernation remove regenerates the boot image after dropping them"
pass "hibernation remove drops the resume hook and kernel parameters"