[PATCH 1/2]: dracut: 95resume: avoid possible symbolic link creation error on bootup

[PATCH 1/2]: dracut: 95resume: avoid possible symbolic link creation error on bootup

[Guido Trentalancia]

Avoid possible symbolic link creation error.

Signed-off-by: Guido Trentalancia <guido-D1bseh+SzQhuxeB9wqlrNw@public.gmane.org>
---
 modules.d/95resume/parse-resume.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -pruN dracut-038-orig/modules.d/95resume/parse-resume.sh dracut-038-95resume-force-symlink/modules.d/95resume/parse-resume.sh
--- dracut-038-orig/modules.d/95resume/parse-resume.sh	2016-04-07 12:36:25.522641317 +0200
+++ dracut-038-95resume-force-symlink/modules.d/95resume/parse-resume.sh	2016-04-07 12:37:19.864406802 +0200
@@ -67,7 +67,7 @@ if ! getarg noresume; then
             printf -- '%s\n' ' RUN+="/sbin/initqueue --finished --unique --name 00resume echo %M:%m  > /sys/power/resume"'
         } >> /etc/udev/rules.d/99-resume.rules
 
-        printf '[ -e "%s" ] && { ln -s "%s" /dev/resume; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
+        printf '[ -e "%s" ] && { ln -sf "%s" /dev/resume; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
             "$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh
 
         {

[PATCH v2 1/2]: dracut: 95resume: avoid possible symbolic link creation error on bootup

[Guido Trentalancia]

Avoid symbolic link creation error (should apply to latest dracut version).

Signed-off-by: Guido Trentalancia <guido-D1bseh+SzQhuxeB9wqlrNw@public.gmane.org>
---
 modules.d/95resume/parse-resume.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- dracut-044/modules.d/95resume/parse-resume.sh	2015-11-25 14:22:28.000000000 +0100
+++ dracut-044-95resume-force-symlink/modules.d/95resume/parse-resume.sh	2016-04-11 17:53:20.664983390 +0200
@@ -67,7 +67,7 @@ if ! getarg noresume; then
             printf -- '%s\n' ' RUN+="/sbin/initqueue --finished --unique --name 00resume echo %M:%m  > /sys/power/resume"'
         } >> /etc/udev/rules.d/99-resume.rules
 
-        printf '[ -e "%s" ] && { ln -s "%s" /dev/resume 2> /dev/null; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
+        printf '[ -e "%s" ] && { ln -sf "%s" /dev/resume 2> /dev/null; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
             "$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh
 
         {

Re: [PATCH v2 1/2]: dracut: 95resume: avoid possible symbolic link creation error on bootup

[Harald Hoyer]

On 11.04.2016 18:00, Guido Trentalancia wrote:
> Avoid symbolic link creation error (should apply to latest dracut version).
> 
> Signed-off-by: Guido Trentalancia <guido-D1bseh+SzQhuxeB9wqlrNw@public.gmane.org>
> ---
>  modules.d/95resume/parse-resume.sh |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- dracut-044/modules.d/95resume/parse-resume.sh	2015-11-25 14:22:28.000000000 +0100
> +++ dracut-044-95resume-force-symlink/modules.d/95resume/parse-resume.sh	2016-04-11 17:53:20.664983390 +0200
> @@ -67,7 +67,7 @@ if ! getarg noresume; then
>              printf -- '%s\n' ' RUN+="/sbin/initqueue --finished --unique --name 00resume echo %M:%m  > /sys/power/resume"'
>          } >> /etc/udev/rules.d/99-resume.rules
>  
> -        printf '[ -e "%s" ] && { ln -s "%s" /dev/resume 2> /dev/null; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
> +        printf '[ -e "%s" ] && { ln -sf "%s" /dev/resume 2> /dev/null; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
>              "$resume" "$resume" "$hookdir" >> $hookdir/initqueue/settled/resume.sh
>  
>          {
> --
> To unsubscribe from this list: send the line "unsubscribe initramfs" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

patching file modules.d/95resume/parse-resume.sh
patch: **** malformed patch at line 8:              printf -- '%s\n' ' RUN+="/sbin/initqueue --finished --unique --name 00resume
echo %M:%m  > /sys/power/resume"'

anyway.. applied by hand and pushed.

Re: [PATCH v2 1/2]: dracut: 95resume: avoid possible symbolic link creation error on bootup

[Guido Trentalancia]

On Fri, 2016-04-15 at 10:39 +0200, Harald Hoyer wrote:
> On 11.04.2016 18:00, Guido Trentalancia wrote:
> > Avoid symbolic link creation error (should apply to latest dracut
> > version).
> > 
> > Signed-off-by: Guido Trentalancia <guido-D1bseh+SzQhuxeB9wqlrNw@public.gmane.org>
> > ---
> >  modules.d/95resume/parse-resume.sh |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > --- dracut-044/modules.d/95resume/parse-resume.sh	2015-11-25 
> > 14:22:28.000000000 +0100
> > +++ dracut-044-95resume-force-symlink/modules.d/95resume/parse-
> > resume.sh	2016-04-11 17:53:20.664983390 +0200
> > @@ -67,7 +67,7 @@ if ! getarg noresume; then
> >              printf -- '%s\n' ' RUN+="/sbin/initqueue --finished --
> > unique --name 00resume echo %M:%m  > /sys/power/resume"'
> >          } >> /etc/udev/rules.d/99-resume.rules
> >  
> > -        printf '[ -e "%s" ] && { ln -s "%s" /dev/resume 2>
> > /dev/null; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
> > +        printf '[ -e "%s" ] && { ln -sf "%s" /dev/resume 2>
> > /dev/null; rm -f -- "$job" "%s/initqueue/timeout/resume.sh"; }\n' \
> >              "$resume" "$resume" "$hookdir" >>
> > $hookdir/initqueue/settled/resume.sh
> >  
> >          {

> 
> patching file modules.d/95resume/parse-resume.sh
> patch: **** malformed patch at line 8:              printf -- '%s\n'
> ' RUN+="/sbin/initqueue --finished --unique --name 00resume
> echo %M:%m  > /sys/power/resume"'

Very strange. I have checked again (version 2 of the patch, not version
1) and it applies cleanly to version 044 and git.

> anyway.. applied by hand and pushed.

Excellent. Thanks.

Regards,

Guido