[meta-networking][PATCH] samba: fix the hardcoded path in init script

[meta-networking][PATCH] samba: fix the hardcoded path in init script

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

Replace the hardcoded path with base_bindir in init
script to fix the error:
/etc/init.d/samba.sh: line 15: /usr/bin/ps: No such file or directory
/etc/init.d/samba.sh: line 17: /usr/bin/sed: No such file or directory
/etc/init.d/samba.sh: line 16: /usr/bin/grep: No such file or directory

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index e9694d4..6c1e3ef 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -111,6 +111,7 @@ do_install_append() {
             -e 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \
             -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \
             -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba.sh,g' \
+            -e 's,/usr/bin,${base_bindir},g' \
             -i ${D}${sysconfdir}/init.d/samba.sh
     fi
 
-- 
1.9.1

Re: [meta-networking][PATCH] samba: fix the hardcoded path in init script

[Koen Kooi]

Op 24-11-16 om 06:57 schreef jackie.huang@windriver.com:
> From: Jackie Huang <jackie.huang@windriver.com>
> 
> Replace the hardcoded path with base_bindir in init script to fix the
> error: /etc/init.d/samba.sh: line 15: /usr/bin/ps: No such file or
> directory /etc/init.d/samba.sh: line 17: /usr/bin/sed: No such file or
> directory /etc/init.d/samba.sh: line 16: /usr/bin/grep: No such file or
> directory
> 
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> --- 
> meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 1 + 1 file
> changed, 1 insertion(+)
> 
> diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb index
> e9694d4..6c1e3ef 100644 ---
> a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++
> b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb @@ -111,6
> +111,7 @@ do_install_append() { -e
> 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ -e
> 's,/opt/samba/log,${localstatedir}/log/samba,g' \ -e
> 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba.sh,g' \ +
> -e 's,/usr/bin,${base_bindir},g' \ -i ${D}${sysconfdir}/init.d/samba.sh 
> fi

Wouldn't it be better to completely remove the absolute paths?

Re: [meta-networking][PATCH] samba: fix the hardcoded path in init script

[Huang, Jie (Jackie)]

> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org [mailto:openembedded-devel-
> bounces@lists.openembedded.org] On Behalf Of Koen Kooi
> Sent: Thursday, November 24, 2016 6:40 PM
> To: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-networking][PATCH] samba: fix the hardcoded path in init script
> 
> Op 24-11-16 om 06:57 schreef jackie.huang@windriver.com:
> > From: Jackie Huang <jackie.huang@windriver.com>
> >
> > Replace the hardcoded path with base_bindir in init script to fix the
> > error: /etc/init.d/samba.sh: line 15: /usr/bin/ps: No such file or
> > directory /etc/init.d/samba.sh: line 17: /usr/bin/sed: No such file or
> > directory /etc/init.d/samba.sh: line 16: /usr/bin/grep: No such file or
> > directory
> >
> > Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---
> > meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 1 + 1 file
> > changed, 1 insertion(+)
> >
> > diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
> > b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb index
> > e9694d4..6c1e3ef 100644 ---
> > a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++
> > b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb @@ -111,6
> > +111,7 @@ do_install_append() { -e
> > 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ -e
> > 's,/opt/samba/log,${localstatedir}/log/samba,g' \ -e
> > 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba.sh,g' \ +
> > -e 's,/usr/bin,${base_bindir},g' \ -i ${D}${sysconfdir}/init.d/samba.sh
> > fi
> 
> Wouldn't it be better to completely remove the absolute paths?

Yeah, the absolute paths don't seem to be necessary, and I think this 
check in the init script is not needed as well:

if [ ! -d /usr/bin ]
then                    # /usr not mounted
        exit
fi

I will make a path to remove them if you're agree.

Thanks,
Jackie

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

Re: [meta-networking][PATCH] samba: fix the hardcoded path in init script

[Koen Kooi]

Op 26-11-16 om 07:26 schreef Huang, Jie (Jackie):
> 
> 
>> -----Original Message-----
>> From: openembedded-devel-bounces@lists.openembedded.org [mailto:openembedded-devel-
>> bounces@lists.openembedded.org] On Behalf Of Koen Kooi
>> Sent: Thursday, November 24, 2016 6:40 PM
>> To: openembedded-devel@lists.openembedded.org
>> Subject: Re: [oe] [meta-networking][PATCH] samba: fix the hardcoded path in init script
>>
>> Op 24-11-16 om 06:57 schreef jackie.huang@windriver.com:
>>> From: Jackie Huang <jackie.huang@windriver.com>
>>>
>>> Replace the hardcoded path with base_bindir in init script to fix the
>>> error: /etc/init.d/samba.sh: line 15: /usr/bin/ps: No such file or
>>> directory /etc/init.d/samba.sh: line 17: /usr/bin/sed: No such file or
>>> directory /etc/init.d/samba.sh: line 16: /usr/bin/grep: No such file or
>>> directory
>>>
>>> Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---
>>> meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 1 + 1 file
>>> changed, 1 insertion(+)
>>>
>>> diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
>>> b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb index
>>> e9694d4..6c1e3ef 100644 ---
>>> a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++
>>> b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb @@ -111,6
>>> +111,7 @@ do_install_append() { -e
>>> 's,/opt/samba/smb.conf,${sysconfdir}/samba/smb.conf,g' \ -e
>>> 's,/opt/samba/log,${localstatedir}/log/samba,g' \ -e
>>> 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba.sh,g' \ +
>>> -e 's,/usr/bin,${base_bindir},g' \ -i ${D}${sysconfdir}/init.d/samba.sh
>>> fi
>>
>> Wouldn't it be better to completely remove the absolute paths?
> 
> Yeah, the absolute paths don't seem to be necessary, and I think this 
> check in the init script is not needed as well:
> 
> if [ ! -d /usr/bin ]
> then                    # /usr not mounted
>         exit
> fi
> 
> I will make a path to remove them if you're agree.

Yes, agree. Thanks for looking into this.