Mailing List Archive: Linux-HA: Dev

[PATCH] ldirectord: Remove dependence on shellfuncs from /etc/init.d/ldirectord

Index | Next | Previous | View Threaded

tateishi.katsuyuki at oss

Nov 22, 2011, 11:10 PM

Post #1 of 5 (278 views)
Permalink

[PATCH] ldirectord: Remove dependence on shellfuncs from /etc/init.d/ldirectord

Hi All,

Please consider applying the attached patch to remove dependence on
shellfuncs from /etc/init.d/ldirectord.

It allows ldirectord-RPM users to run /etc/init.d/ldirectord without
resource-agents RPM installed.

It is quite harmless, because /etc/init.d/ldirectord does not use any
functions in /etc/ha.d/shellfuncs.

Thank you,

--
TATEISHI Katsuyuki <tateishi.katsuyuki [at] oss>

--

diff --git a/ldirectord/init.d/ldirectord.in b/ldirectord/init.d/ldirectord.in
index 8f84b8d..9d8083e 100755
--- a/ldirectord/init.d/ldirectord.in
+++ b/ldirectord/init.d/ldirectord.in
@@ -31,8 +31,6 @@

DAEMON=@sbindir@/ldirectord

-. @sysconfdir@/ha.d/shellfuncs
-
# Source function library.
if
[ -f /etc/rc.d/init.d/functions ]
_______________________________________________________
Linux-HA-Dev: Linux-HA-Dev [at] lists
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/

horms at verge

Nov 22, 2011, 11:52 PM

Post #2 of 5 (274 views)
Permalink

Re: [PATCH] ldirectord: Remove dependence on shellfuncs from /etc/init.d/ldirectord [In reply to]

On Wed, Nov 23, 2011 at 04:10:46PM +0900, TATEISHI Katsuyuki wrote:
> Hi All,
>
> Please consider applying the attached patch to remove dependence on
> shellfuncs from /etc/init.d/ldirectord.
>
> It allows ldirectord-RPM users to run /etc/init.d/ldirectord without
> resource-agents RPM installed.
>
> It is quite harmless, because /etc/init.d/ldirectord does not use any
> functions in /etc/ha.d/shellfuncs.
>
> Thank you,

Hi Tateishi-san,

this looks good to me.

Dejan, could you apply it?

>
> --
> TATEISHI Katsuyuki <tateishi.katsuyuki [at] oss>
>
> --
>
> diff --git a/ldirectord/init.d/ldirectord.in b/ldirectord/init.d/ldirectord.in
> index 8f84b8d..9d8083e 100755
> --- a/ldirectord/init.d/ldirectord.in
> +++ b/ldirectord/init.d/ldirectord.in
> @@ -31,8 +31,6 @@
>
> DAEMON=@sbindir@/ldirectord
>
> -. @sysconfdir@/ha.d/shellfuncs
> -
> # Source function library.
> if
> [ -f /etc/rc.d/init.d/functions ]
> _______________________________________________________
> Linux-HA-Dev: Linux-HA-Dev [at] lists
> http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
> Home Page: http://linux-ha.org/
>
_______________________________________________________
Linux-HA-Dev: Linux-HA-Dev [at] lists
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/

florian at hastexo

Nov 23, 2011, 12:10 AM

Post #3 of 5 (270 views)
Permalink

Re: [PATCH] ldirectord: Remove dependence on shellfuncs from /etc/init.d/ldirectord [In reply to]

On 11/23/11 08:52, Simon Horman wrote:
> On Wed, Nov 23, 2011 at 04:10:46PM +0900, TATEISHI Katsuyuki wrote:
>> Hi All,
>>
>> Please consider applying the attached patch to remove dependence on
>> shellfuncs from /etc/init.d/ldirectord.
>>
>> It allows ldirectord-RPM users to run /etc/init.d/ldirectord without
>> resource-agents RPM installed.
>>
>> It is quite harmless, because /etc/init.d/ldirectord does not use any
>> functions in /etc/ha.d/shellfuncs.
>>
>> Thank you,
>
> Hi Tateishi-san,
>
> this looks good to me.
>
> Dejan, could you apply it?

I had just merged Mori-san's Makefile.am patch, so I picked up this one
as well. Merged and pushed, with a slightly modified commit message:

https://github.com/ClusterLabs/resource-agents/commit/6c2e8146c757da47b7ff926edb6895f7b1832e55

Thanks!

Cheers,
Florian

_______________________________________________________
Linux-HA-Dev: Linux-HA-Dev [at] lists
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/

tateishi.katsuyuki at oss

Nov 23, 2011, 12:24 AM

Post #4 of 5 (270 views)
Permalink

Re: [PATCH] ldirectord: Remove dependence on shellfuncs from /etc/init.d/ldirectord [In reply to]

Florian Haas <florian [at] hastexo>-san wrote:

> On 11/23/11 08:52, Simon Horman wrote:
>> On Wed, Nov 23, 2011 at 04:10:46PM +0900, TATEISHI Katsuyuki wrote:
>>> Hi All,
>>>
>>> Please consider applying the attached patch to remove dependence on
>>> shellfuncs from /etc/init.d/ldirectord.
>>>
>>> It allows ldirectord-RPM users to run /etc/init.d/ldirectord without
>>> resource-agents RPM installed.
>>>
>>> It is quite harmless, because /etc/init.d/ldirectord does not use any
>>> functions in /etc/ha.d/shellfuncs.
>>>
>>> Thank you,
>>
>> Hi Tateishi-san,
>>
>> this looks good to me.
>>
>> Dejan, could you apply it?
>
> I had just merged Mori-san's Makefile.am patch, so I picked up this one
> as well. Merged and pushed, with a slightly modified commit message:
>
> https://github.com/ClusterLabs/resource-agents/commit/6c2e8146c757da47b7ff926edb6895f7b1832e55
>
> Thanks!

Thank you for your review and applying!

--
TATEISHI Katsuyuki <tateishi.katsuyuki [at] oss>
_______________________________________________________
Linux-HA-Dev: Linux-HA-Dev [at] lists
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/

horms at verge

Nov 23, 2011, 1:01 AM

Post #5 of 5 (274 views)
Permalink

Re: [PATCH] ldirectord: Remove dependence on shellfuncs from /etc/init.d/ldirectord [In reply to]

On Wed, Nov 23, 2011 at 09:10:52AM +0100, Florian Haas wrote:
> On 11/23/11 08:52, Simon Horman wrote:
> > On Wed, Nov 23, 2011 at 04:10:46PM +0900, TATEISHI Katsuyuki wrote:
> >> Hi All,
> >>
> >> Please consider applying the attached patch to remove dependence on
> >> shellfuncs from /etc/init.d/ldirectord.
> >>
> >> It allows ldirectord-RPM users to run /etc/init.d/ldirectord without
> >> resource-agents RPM installed.
> >>
> >> It is quite harmless, because /etc/init.d/ldirectord does not use any
> >> functions in /etc/ha.d/shellfuncs.
> >>
> >> Thank you,
> >
> > Hi Tateishi-san,
> >
> > this looks good to me.
> >
> > Dejan, could you apply it?
>
> I had just merged Mori-san's Makefile.am patch, so I picked up this one
> as well. Merged and pushed, with a slightly modified commit message:
>
> https://github.com/ClusterLabs/resource-agents/commit/6c2e8146c757da47b7ff926edb6895f7b1832e55

Thanks Florian
_______________________________________________________
Linux-HA-Dev: Linux-HA-Dev [at] lists
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/

Index | Next | Previous | View Threaded

Interested in having your list archived? Contact Gossamer Threads