Browse Source

resume/module-setup.sh: filter out empty resume= options in cmdline()

cmdline() prints empty "resume=" options for non-persistent swap
devices, for example zram. Add a check for that.

This patch also fixes printf formatting and removes unused variables.
master
Alexander Tsoy 11 years ago committed by Harald Hoyer
parent
commit
c4b529f503
  1. 6
      modules.d/95resume/module-setup.sh

6
modules.d/95resume/module-setup.sh

@ -17,12 +17,12 @@ check() {


# called by dracut # called by dracut
cmdline() { cmdline() {
local _activated local _resume
declare -A _activated


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



Loading…
Cancel
Save