mkinitrd unification across distributions
 help / color / mirror / Atom feed
* [PATCH] resume: fix double escaping in printf
@ 2014-01-10 16:51 Zbigniew Jędrzejewski-Szmek
       [not found] ` <1389372684-26465-1-git-send-email-zbyszek-wrcVdnn0TatmR6Xm/wNWPw@public.gmane.org>
  0 siblings, 1 reply; 2+ messages in thread
From: Zbigniew Jędrzejewski-Szmek @ 2014-01-10 16:51 UTC (permalink / raw)
  To: initramfs-u79uwXL29TY76Z2rM5mHXA, Harald Hoyer
  Cc: Zbigniew Jędrzejewski-Szmek

https://bugzilla.redhat.com/show_bug.cgi?id=1045704
---
 modules.d/95resume/parse-resume.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules.d/95resume/parse-resume.sh b/modules.d/95resume/parse-resume.sh
index 8682a03..44c62dd 100755
--- a/modules.d/95resume/parse-resume.sh
+++ b/modules.d/95resume/parse-resume.sh
@@ -59,10 +59,10 @@ if ! getarg noresume; then
             fi
             printf -- "KERNEL==\"%s\", " ${resume#/dev/};
             printf -- "ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\","
-            printf -- "%s" " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m > /sys/power/resume\"\n"
+            printf -- " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m > /sys/power/resume\"\n"
             printf -- "SYMLINK==\"%s\", " ${resume#/dev/};
-            printf -- "%s" "ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\","
-            printf -- "%s" " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m  > /sys/power/resume\"\n"
+            printf -- "ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\","
+            printf -- " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m  > /sys/power/resume\"\n"
         } >> /etc/udev/rules.d/99-resume.rules
 
         printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
-- 
1.8.4.2

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] resume: fix double escaping in printf
       [not found] ` <1389372684-26465-1-git-send-email-zbyszek-wrcVdnn0TatmR6Xm/wNWPw@public.gmane.org>
@ 2014-01-28 14:41   ` Harald Hoyer
  0 siblings, 0 replies; 2+ messages in thread
From: Harald Hoyer @ 2014-01-28 14:41 UTC (permalink / raw)
  To: Zbigniew Jędrzejewski-Szmek,
	initramfs-u79uwXL29TY76Z2rM5mHXA

On 01/10/2014 05:51 PM, Zbigniew Jędrzejewski-Szmek wrote:
> https://bugzilla.redhat.com/show_bug.cgi?id=1045704
> ---
>  modules.d/95resume/parse-resume.sh | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/modules.d/95resume/parse-resume.sh b/modules.d/95resume/parse-resume.sh
> index 8682a03..44c62dd 100755
> --- a/modules.d/95resume/parse-resume.sh
> +++ b/modules.d/95resume/parse-resume.sh
> @@ -59,10 +59,10 @@ if ! getarg noresume; then
>              fi
>              printf -- "KERNEL==\"%s\", " ${resume#/dev/};
>              printf -- "ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\","
> -            printf -- "%s" " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m > /sys/power/resume\"\n"
> +            printf -- " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m > /sys/power/resume\"\n"
>              printf -- "SYMLINK==\"%s\", " ${resume#/dev/};
> -            printf -- "%s" "ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\","
> -            printf -- "%s" " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m  > /sys/power/resume\"\n"
> +            printf -- "ACTION==\"add|change\", ENV{ID_FS_TYPE}==\"suspend|swsuspend|swsupend\","
> +            printf -- " RUN+=\"/sbin/initqueue --finished --unique --name 00resume echo %%M:%%m  > /sys/power/resume\"\n"
>          } >> /etc/udev/rules.d/99-resume.rules
>  
>          printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
> 

Thanks! Pushed a slightly different version

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-01-28 14:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-10 16:51 [PATCH] resume: fix double escaping in printf Zbigniew Jędrzejewski-Szmek
     [not found] ` <1389372684-26465-1-git-send-email-zbyszek-wrcVdnn0TatmR6Xm/wNWPw@public.gmane.org>
2014-01-28 14:41   ` Harald Hoyer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox