* [ptxdist] [PATCH] rauc: install rauc service wrapper script for non-systemd systems @ 2018-02-13 10:22 Bastian Stender 2018-02-13 11:51 ` Michael Olbrich 0 siblings, 1 reply; 6+ messages in thread From: Bastian Stender @ 2018-02-13 10:22 UTC (permalink / raw) To: ptxdist; +Cc: Bastian Stender This is called by dbus activation via /usr/share/dbus-1/system-services/de.pengutronix.rauc.service when systemd is not used. Signed-off-by: Bastian Stender <bst@pengutronix.de> --- rules/rauc.make | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rules/rauc.make b/rules/rauc.make index bc3b9462a..c7879f348 100644 --- a/rules/rauc.make +++ b/rules/rauc.make @@ -81,6 +81,9 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD /usr/lib/systemd/system/rauc-mark-good.service) @$(call install_link, rauc, ../rauc-mark-good.service, \ /usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service) +else + @$(call install_copy, rauc, 0, 0, 0755, -, \ + /usr/libexec/rauc-service.sh) endif @$(call install_finish, rauc) -- 2.11.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] rauc: install rauc service wrapper script for non-systemd systems 2018-02-13 10:22 [ptxdist] [PATCH] rauc: install rauc service wrapper script for non-systemd systems Bastian Stender @ 2018-02-13 11:51 ` Michael Olbrich 2018-02-13 12:00 ` Bastian Stender 0 siblings, 1 reply; 6+ messages in thread From: Michael Olbrich @ 2018-02-13 11:51 UTC (permalink / raw) To: ptxdist On Tue, Feb 13, 2018 at 11:22:14AM +0100, Bastian Stender wrote: > This is called by dbus activation via > /usr/share/dbus-1/system-services/de.pengutronix.rauc.service when > systemd is not used. > > Signed-off-by: Bastian Stender <bst@pengutronix.de> > --- > rules/rauc.make | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/rules/rauc.make b/rules/rauc.make > index bc3b9462a..c7879f348 100644 > --- a/rules/rauc.make > +++ b/rules/rauc.make > @@ -81,6 +81,9 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD > /usr/lib/systemd/system/rauc-mark-good.service) > @$(call install_link, rauc, ../rauc-mark-good.service, \ > /usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service) > +else > + @$(call install_copy, rauc, 0, 0, 0755, -, \ > + /usr/libexec/rauc-service.sh) $ cat /usr/libexec/rauc-service.sh #!/bin/sh export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin /usr/local/bin/rauc service This cannot work. Michael > endif > > @$(call install_finish, rauc) > -- > 2.11.0 > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] rauc: install rauc service wrapper script for non-systemd systems 2018-02-13 11:51 ` Michael Olbrich @ 2018-02-13 12:00 ` Bastian Stender 2018-02-13 13:45 ` Bastian Stender 0 siblings, 1 reply; 6+ messages in thread From: Bastian Stender @ 2018-02-13 12:00 UTC (permalink / raw) To: ptxdist On 02/13/2018 12:51 PM, Michael Olbrich wrote: > On Tue, Feb 13, 2018 at 11:22:14AM +0100, Bastian Stender wrote: >> This is called by dbus activation via >> /usr/share/dbus-1/system-services/de.pengutronix.rauc.service when >> systemd is not used. >> >> Signed-off-by: Bastian Stender <bst@pengutronix.de> >> --- >> rules/rauc.make | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/rules/rauc.make b/rules/rauc.make >> index bc3b9462a..c7879f348 100644 >> --- a/rules/rauc.make >> +++ b/rules/rauc.make >> @@ -81,6 +81,9 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD >> /usr/lib/systemd/system/rauc-mark-good.service) >> @$(call install_link, rauc, ../rauc-mark-good.service, \ >> /usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service) >> +else >> + @$(call install_copy, rauc, 0, 0, 0755, -, \ >> + /usr/libexec/rauc-service.sh) > > > $ cat /usr/libexec/rauc-service.sh > #!/bin/sh > export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin > /usr/local/bin/rauc service > > This cannot work. Yes, another case of host path leakage just like [1]. I will try to fix this in rauc and resend the patch when we do the next rauc version bump in ptxdist. Regards, Bastian [1] https://github.com/rauc/rauc/commit/e11922985221211feef5cd8649564ee750c73038#diff-c949f93d03f44a4217d7a138f9e2e54a -- Pengutronix e.K. Industrial Linux Solutions http://www.pengutronix.de/ Peiner Str. 6-8, 31137 Hildesheim, Germany Amtsgericht Hildesheim, HRA 2686 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] rauc: install rauc service wrapper script for non-systemd systems 2018-02-13 12:00 ` Bastian Stender @ 2018-02-13 13:45 ` Bastian Stender 2018-02-13 15:42 ` Enrico Joerns 0 siblings, 1 reply; 6+ messages in thread From: Bastian Stender @ 2018-02-13 13:45 UTC (permalink / raw) To: ptxdist On 02/13/2018 01:00 PM, Bastian Stender wrote: > On 02/13/2018 12:51 PM, Michael Olbrich wrote: >> On Tue, Feb 13, 2018 at 11:22:14AM +0100, Bastian Stender wrote: >>> This is called by dbus activation via >>> /usr/share/dbus-1/system-services/de.pengutronix.rauc.service when >>> systemd is not used. >>> >>> Signed-off-by: Bastian Stender <bst@pengutronix.de> >>> --- >>> rules/rauc.make | 3 +++ >>> 1 file changed, 3 insertions(+) >>> >>> diff --git a/rules/rauc.make b/rules/rauc.make >>> index bc3b9462a..c7879f348 100644 >>> --- a/rules/rauc.make >>> +++ b/rules/rauc.make >>> @@ -81,6 +81,9 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD >>> /usr/lib/systemd/system/rauc-mark-good.service) >>> @$(call install_link, rauc, ../rauc-mark-good.service, \ >>> >>> /usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service) >>> +else >>> + @$(call install_copy, rauc, 0, 0, 0755, -, \ >>> + /usr/libexec/rauc-service.sh) >> >> >> $ cat /usr/libexec/rauc-service.sh >> #!/bin/sh >> export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin >> /usr/local/bin/rauc service >> >> This cannot work. > > Yes, another case of host path leakage just like [1]. I will try to fix > this in rauc and resend the patch when we do the next rauc version bump > in ptxdist. FTR: https://github.com/rauc/rauc/pull/228 Regards, Bastian -- Pengutronix e.K. Industrial Linux Solutions http://www.pengutronix.de/ Peiner Str. 6-8, 31137 Hildesheim, Germany Amtsgericht Hildesheim, HRA 2686 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] rauc: install rauc service wrapper script for non-systemd systems 2018-02-13 13:45 ` Bastian Stender @ 2018-02-13 15:42 ` Enrico Joerns 2018-02-13 16:01 ` Michael Olbrich 0 siblings, 1 reply; 6+ messages in thread From: Enrico Joerns @ 2018-02-13 15:42 UTC (permalink / raw) To: ptxdist, Bastian Stender On 02/13/2018 02:45 PM, Bastian Stender wrote: > On 02/13/2018 01:00 PM, Bastian Stender wrote: >> On 02/13/2018 12:51 PM, Michael Olbrich wrote: >>> On Tue, Feb 13, 2018 at 11:22:14AM +0100, Bastian Stender wrote: >>>> This is called by dbus activation via >>>> /usr/share/dbus-1/system-services/de.pengutronix.rauc.service when >>>> systemd is not used. >>>> >>>> Signed-off-by: Bastian Stender <bst@pengutronix.de> >>>> --- >>>> rules/rauc.make | 3 +++ >>>> 1 file changed, 3 insertions(+) >>>> >>>> diff --git a/rules/rauc.make b/rules/rauc.make >>>> index bc3b9462a..c7879f348 100644 >>>> --- a/rules/rauc.make >>>> +++ b/rules/rauc.make >>>> @@ -81,6 +81,9 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD >>>> /usr/lib/systemd/system/rauc-mark-good.service) >>>> @$(call install_link, rauc, ../rauc-mark-good.service, \ >>>> /usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service) >>>> +else >>>> + @$(call install_copy, rauc, 0, 0, 0755, -, \ >>>> + /usr/libexec/rauc-service.sh) >>> >>> >>> $ cat /usr/libexec/rauc-service.sh >>> #!/bin/sh >>> export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin >>> /usr/local/bin/rauc service >>> >>> This cannot work. >> >> Yes, another case of host path leakage just like [1]. I will try to fix >> this in rauc and resend the patch when we do the next rauc version bump >> in ptxdist. > > FTR: https://github.com/rauc/rauc/pull/228 Thanks for fixing! I've applied the patch to RAUC mainline. To prevent forgetting this, what about adding the RAUC patch to ptxdist and applying the rule file change? Enrico -- Pengutronix e.K. | Enrico Jörns | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5080 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] rauc: install rauc service wrapper script for non-systemd systems 2018-02-13 15:42 ` Enrico Joerns @ 2018-02-13 16:01 ` Michael Olbrich 0 siblings, 0 replies; 6+ messages in thread From: Michael Olbrich @ 2018-02-13 16:01 UTC (permalink / raw) To: ptxdist On Tue, Feb 13, 2018 at 04:42:24PM +0100, Enrico Joerns wrote: > On 02/13/2018 02:45 PM, Bastian Stender wrote: > > On 02/13/2018 01:00 PM, Bastian Stender wrote: > > > On 02/13/2018 12:51 PM, Michael Olbrich wrote: > > > > On Tue, Feb 13, 2018 at 11:22:14AM +0100, Bastian Stender wrote: > > > > > This is called by dbus activation via > > > > > /usr/share/dbus-1/system-services/de.pengutronix.rauc.service when > > > > > systemd is not used. > > > > > > > > > > Signed-off-by: Bastian Stender <bst@pengutronix.de> > > > > > --- > > > > > rules/rauc.make | 3 +++ > > > > > 1 file changed, 3 insertions(+) > > > > > > > > > > diff --git a/rules/rauc.make b/rules/rauc.make > > > > > index bc3b9462a..c7879f348 100644 > > > > > --- a/rules/rauc.make > > > > > +++ b/rules/rauc.make > > > > > @@ -81,6 +81,9 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD > > > > > /usr/lib/systemd/system/rauc-mark-good.service) > > > > > @$(call install_link, rauc, ../rauc-mark-good.service, \ > > > > > /usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service) > > > > > +else > > > > > + @$(call install_copy, rauc, 0, 0, 0755, -, \ > > > > > + /usr/libexec/rauc-service.sh) > > > > > > > > > > > > $ cat /usr/libexec/rauc-service.sh > > > > #!/bin/sh > > > > export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin > > > > /usr/local/bin/rauc service > > > > > > > > This cannot work. > > > > > > Yes, another case of host path leakage just like [1]. I will try to fix > > > this in rauc and resend the patch when we do the next rauc version bump > > > in ptxdist. > > > > FTR: https://github.com/rauc/rauc/pull/228 > > Thanks for fixing! I've applied the patch to RAUC mainline. > > To prevent forgetting this, what about adding the RAUC patch to ptxdist and > applying the rule file change? Sure, just add the patch to the commit that installs the script. Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-02-13 16:01 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-02-13 10:22 [ptxdist] [PATCH] rauc: install rauc service wrapper script for non-systemd systems Bastian Stender 2018-02-13 11:51 ` Michael Olbrich 2018-02-13 12:00 ` Bastian Stender 2018-02-13 13:45 ` Bastian Stender 2018-02-13 15:42 ` Enrico Joerns 2018-02-13 16:01 ` Michael Olbrich
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox