[PATCH] systemd: Use ${ROOT_HOME} instead of /root

[PATCH] systemd: Use ${ROOT_HOME} instead of /root

[Dan McGregor]

From: Dan McGregor <dan.mcgregor@usask.ca>

systemd avoids using nss lookups for the root user, so
naturally it assumes that root's home directory is /root.
In OE that's not the case, and it can lead to long delays when
shutting down due to user shutdown unit failures.

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
---
 meta/recipes-core/systemd/systemd_216.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-core/systemd/systemd_216.bb
b/meta/recipes-core/systemd/systemd_216.bb
index a7fd71e..e6b79d2 100644
--- a/meta/recipes-core/systemd/systemd_216.bb
+++ b/meta/recipes-core/systemd/systemd_216.bb
@@ -97,6 +97,10 @@ do_configure_prepend() {
  cp -r ${S}/units ${S}/units.pre_sed
  fi
  sed -i -e 's:=/root:=${ROOT_HOME}:g' ${S}/units/*.service*
+ sed -i -e 's:"/root":"${ROOT_HOME}":g' \
+        ${S}/src/core/unit-printf.c \
+        ${S}/src/nspawn/nspawn.c \
+        ${S}/src/shared/util.c
  sed -i '/ln --relative --help/d' ${S}/configure.ac
  sed -i -e 's:\$(LN_S) --relative -f:lnr:g' ${S}/Makefile.am
  sed -i -e 's:\$(LN_S) --relative:lnr:g' ${S}/Makefile.am
-- 
1.9.3

Re: [PATCH] systemd: Use ${ROOT_HOME} instead of /root

[Burton, Ross]

On 3 September 2014 20:57, Dan McGregor <danismostlikely@gmail.com> wrote:
>   sed -i -e 's:=/root:=${ROOT_HOME}:g' ${S}/units/*.service*
> + sed -i -e 's:"/root":"${ROOT_HOME}":g' \
> +        ${S}/src/core/unit-printf.c \
> +        ${S}/src/nspawn/nspawn.c \
> +        ${S}/src/shared/util.c

Sedding service files is one thing, but entire C files is another.
Can you please sent this change as a patch to the source?  FWIW for
patches where the context isn't that relevant I've started using
patches without the context lines so there's more chance of them
applying in future releases.

Ross

Re: [PATCH] systemd: Use ${ROOT_HOME} instead of /root

[Dan McGregor]

On 5 September 2014 03:14, Burton, Ross <ross.burton@intel.com> wrote:
> On 3 September 2014 20:57, Dan McGregor <danismostlikely@gmail.com> wrote:
>>   sed -i -e 's:=/root:=${ROOT_HOME}:g' ${S}/units/*.service*
>> + sed -i -e 's:"/root":"${ROOT_HOME}":g' \
>> +        ${S}/src/core/unit-printf.c \
>> +        ${S}/src/nspawn/nspawn.c \
>> +        ${S}/src/shared/util.c
>
> Sedding service files is one thing, but entire C files is another.
> Can you please sent this change as a patch to the source?  FWIW for
> patches where the context isn't that relevant I've started using
> patches without the context lines so there's more chance of them
> applying in future releases.

I thought that myself, but ${ROOT_HOME} is a variable. I think to do
that a patch would
need to make the root home directory configurable, and not simply
hardcode it. That shouldn't
be too hard to do. I'll do that later tonight.

>
> Ross

Re: [PATCH] systemd: Use ${ROOT_HOME} instead of /root

[Burton, Ross]

On 5 September 2014 15:55, Dan McGregor <danismostlikely@gmail.com> wrote:
> On 5 September 2014 03:14, Burton, Ross <ross.burton@intel.com> wrote:
>> On 3 September 2014 20:57, Dan McGregor <danismostlikely@gmail.com> wrote:
>>>   sed -i -e 's:=/root:=${ROOT_HOME}:g' ${S}/units/*.service*
>>> + sed -i -e 's:"/root":"${ROOT_HOME}":g' \
>>> +        ${S}/src/core/unit-printf.c \
>>> +        ${S}/src/nspawn/nspawn.c \
>>> +        ${S}/src/shared/util.c
>>
>> Sedding service files is one thing, but entire C files is another.
>> Can you please sent this change as a patch to the source?  FWIW for
>> patches where the context isn't that relevant I've started using
>> patches without the context lines so there's more chance of them
>> applying in future releases.
>
> I thought that myself, but ${ROOT_HOME} is a variable. I think to do
> that a patch would
> need to make the root home directory configurable, and not simply
> hardcode it. That shouldn't
> be too hard to do. I'll do that later tonight.

Sed the patch? :)

Creative solutions welcome, I'm just wary of such loose seds in source
code.  If the only sane way is to sed then that's what we'll have to
do.

Ross

Re: [PATCH] systemd: Use ${ROOT_HOME} instead of /root

[Mark Hatle]

On 9/5/14, 10:27 AM, Burton, Ross wrote:
> On 5 September 2014 15:55, Dan McGregor <danismostlikely@gmail.com> wrote:
>> On 5 September 2014 03:14, Burton, Ross <ross.burton@intel.com> wrote:
>>> On 3 September 2014 20:57, Dan McGregor <danismostlikely@gmail.com> wrote:
>>>>    sed -i -e 's:=/root:=${ROOT_HOME}:g' ${S}/units/*.service*
>>>> + sed -i -e 's:"/root":"${ROOT_HOME}":g' \
>>>> +        ${S}/src/core/unit-printf.c \
>>>> +        ${S}/src/nspawn/nspawn.c \
>>>> +        ${S}/src/shared/util.c
>>>
>>> Sedding service files is one thing, but entire C files is another.
>>> Can you please sent this change as a patch to the source?  FWIW for
>>> patches where the context isn't that relevant I've started using
>>> patches without the context lines so there's more chance of them
>>> applying in future releases.
>>
>> I thought that myself, but ${ROOT_HOME} is a variable. I think to do
>> that a patch would
>> need to make the root home directory configurable, and not simply
>> hardcode it. That shouldn't
>> be too hard to do. I'll do that later tonight.
>
> Sed the patch? :)
>
> Creative solutions welcome, I'm just wary of such loose seds in source
> code.  If the only sane way is to sed then that's what we'll have to
> do.

I'd prefer a patch that used a define myself.  I don't like seds of source or 
patches...

--Mark

> Ross
>

Re: [PATCH] systemd: Use ${ROOT_HOME} instead of /root

[Burton, Ross]

On 5 September 2014 16:31, Mark Hatle <mark.hatle@windriver.com> wrote:
> I'd prefer a patch that used a define myself.  I don't like seds of source
> or patches...

A #define for /root might even get upstream.

Ross

Re: [PATCH] systemd: Use ${ROOT_HOME} instead of /root

[Dan McGregor]

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

On Sep 5, 2014 9:54 AM, "Burton, Ross" <ross.burton@intel.com> wrote:
>
> On 5 September 2014 16:31, Mark Hatle <mark.hatle@windriver.com> wrote:
> > I'd prefer a patch that used a define myself.  I don't like seds of
source
> > or patches...
>
> A #define for /root might even get upstream.
>

I hacked up configure to do this. I'll submit it this evening.

> Ross
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

[-- Attachment #2: Type: text/html, Size: 992 bytes --]