[PATCH] resume/parse-resume.sh: add missing braces

[PATCH] resume/parse-resume.sh: add missing braces

[Daniel Schaal]

---
 modules.d/95resume/parse-resume.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules.d/95resume/parse-resume.sh b/modules.d/95resume/parse-resume.sh
index d7b2d7f..a97ef7b 100755
--- a/modules.d/95resume/parse-resume.sh
+++ b/modules.d/95resume/parse-resume.sh
@@ -70,9 +70,10 @@ if ! getarg noresume; then
         printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
             "$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh
 
-        printf -- "%s" 'warn "Cancelling resume operation. Device not found.";'
-        printf -- ' cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";\n' \
-            "$hookdir" >> $hookdir/initqueue/timeout/resume.sh
+	{
+            printf -- "%s" 'warn "Cancelling resume operation. Device not found.";'
+            printf -- ' cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";\n' "$hookdir"
+        } >> $hookdir/initqueue/timeout/resume.sh
 
         mv /lib/dracut/resume.sh /lib/dracut/hooks/pre-mount/10-resume.sh
     else
-- 
1.9.2

Re: [PATCH] resume/parse-resume.sh: add missing braces

[Harald Hoyer]

On 19.04.2014 18:23, Daniel Schaal wrote:
> ---
>  modules.d/95resume/parse-resume.sh | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/modules.d/95resume/parse-resume.sh b/modules.d/95resume/parse-resume.sh
> index d7b2d7f..a97ef7b 100755
> --- a/modules.d/95resume/parse-resume.sh
> +++ b/modules.d/95resume/parse-resume.sh
> @@ -70,9 +70,10 @@ if ! getarg noresume; then
>          printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
>              "$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh
>  
> -        printf -- "%s" 'warn "Cancelling resume operation. Device not found.";'
> -        printf -- ' cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";\n' \
> -            "$hookdir" >> $hookdir/initqueue/timeout/resume.sh
> +	{
> +            printf -- "%s" 'warn "Cancelling resume operation. Device not found.";'
> +            printf -- ' cancel_wait_for_dev /dev/resume; rm -f -- "$job" "%s/initqueue/settled/resume.sh";\n' "$hookdir"
> +        } >> $hookdir/initqueue/timeout/resume.sh
>  
>          mv /lib/dracut/resume.sh /lib/dracut/hooks/pre-mount/10-resume.sh
>      else
> 

Thanks!

http://git.kernel.org/cgit/boot/dracut/dracut.git/commit/?id=636cc1ef634704ffc5e037961b6fb8ede3203977