* [PATCH] resume/module-setup.sh: filter out empty resume= options in cmdline()
@ 2014-05-16 17:12 Alexander Tsoy
[not found] ` <E1WlLlY-0007GR-QD-C3g8GgeTu50ox3rIn2DAYQ@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Alexander Tsoy @ 2014-05-16 17:12 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA
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.
---
modules.d/95resume/module-setup.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
index ceb7855..b1b4684 100755
--- a/modules.d/95resume/module-setup.sh
+++ b/modules.d/95resume/module-setup.sh
@@ -17,12 +17,12 @@ check() {
# called by dracut
cmdline() {
- local _activated
- declare -A _activated
+ local _resume
for dev in "${!host_fs_types[@]}"; do
[[ ${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
}
--
1.8.5.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] resume/module-setup.sh: filter out empty resume= options in cmdline()
[not found] ` <E1WlLlY-0007GR-QD-C3g8GgeTu50ox3rIn2DAYQ@public.gmane.org>
@ 2014-05-20 11:30 ` Harald Hoyer
0 siblings, 0 replies; 2+ messages in thread
From: Harald Hoyer @ 2014-05-20 11:30 UTC (permalink / raw)
To: Alexander Tsoy, initramfs-u79uwXL29TY76Z2rM5mHXA
On 16.05.2014 19:12, Alexander Tsoy wrote:
> 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.
> ---
> modules.d/95resume/module-setup.sh | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/modules.d/95resume/module-setup.sh b/modules.d/95resume/module-setup.sh
> index ceb7855..b1b4684 100755
> --- a/modules.d/95resume/module-setup.sh
> +++ b/modules.d/95resume/module-setup.sh
> @@ -17,12 +17,12 @@ check() {
>
> # called by dracut
> cmdline() {
> - local _activated
> - declare -A _activated
> + local _resume
>
> for dev in "${!host_fs_types[@]}"; do
> [[ ${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
> }
>
>
thanks!
http://git.kernel.org/cgit/boot/dracut/dracut.git/commit/?id=c4b529f50388474ceffa8c918d2722fc777eac0a
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-20 11:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-16 17:12 [PATCH] resume/module-setup.sh: filter out empty resume= options in cmdline() Alexander Tsoy
[not found] ` <E1WlLlY-0007GR-QD-C3g8GgeTu50ox3rIn2DAYQ@public.gmane.org>
2014-05-20 11:30 ` Harald Hoyer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox