Skip to content

feat(resume): add device used for resume #84

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

Open
pvalena wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(resume): add device used for resume #84

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
21 changes: 19 additions & 2 deletions modules.d/74resume/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,26 +46,43 @@ depends() {
}

# called by dracut
cmdline() {
_get_resume_dev() {
local _resume

for dev in "${!host_fs_types[@]}"; do
[[ ${host_fs_types[$dev]} =~ ^(swap|swsuspend|swsupend)$ ]] || continue
_resume=$(shorten_persistent_dev "$(get_persistent_dev "$dev")")
[[ -n ${_resume} ]] && printf " resume=%s" "${_resume}"
[[ -n ${_resume} ]] && echo "${_resume}"
done
}

# called by dracut
cmdline() {
local _resume
_resume=$(_get_resume_dev)
[[ -n ${_resume} ]] && printf " resume=%s" "${_resume}"
}

# called by dracut
install() {
local _bin
local _resumeconf
local _dev

if [[ $hostonly_cmdline == "yes" ]]; then
_resumeconf=$(cmdline)
[[ $_resumeconf ]] && printf "%s\n" "$_resumeconf" >> "${initdir}/etc/cmdline.d/20-resume.conf"
fi

# If we have a resume device on cmdline, we its drivers in initrd regardless whether it's currently mounted
# check current cmdline as well as fstab one
_dev=$(_get_resume_dev)
[[ $_dev ]] && push_user_devs "$_dev"

_dev=$(grep -oP "resume=\K([^ ]*)" /proc/cmdline)
_dev=$(shorten_persistent_dev "$(get_persistent_dev "$_dev")")
[[ $_dev ]] && push_user_devs "$_dev"

# if systemd is included and has the hibernate-resume tool, use it and nothing else
if dracut_module_included "systemd" && [[ -x "${dracutsysrootdir-}$systemdutildir/systemd-hibernate-resume" ]]; then
inst_multiple -o \
Expand Down
Loading