On Tue, Jun 21, 2011 at 06:43:25AM -0600, Serge Dubrouski wrote: > Hello Dejan - > > Yes, and here is one more patch to replace that exit with return and fix a > mistypo.
OK. All applied. The latter split into two patches, because the changes are unrelated. Cheers, Dejan > On Tue, Jun 21, 2011 at 6:29 AM, Dejan Muhamedagic <[email protected]>wrote: > > > Hi Serge, > > > > On Mon, Jun 20, 2011 at 02:37:24PM -0600, Serge Dubrouski wrote: > > > Sorry. > > > > Is this the proper fix now? > > > > Cheers, > > > > Dejan > > > > > On Mon, Jun 20, 2011 at 2:22 PM, Vadym Chepkov <[email protected]> > > wrote: > > > > > > > > > > > On Jun 20, 2011, at 3:55 PM, Serge Dubrouski wrote: > > > > > > > > > Patch is attached. > > > > > > > > > > > > Your patch is damaged, it has lines cut short. > > > > > > > > Vadym > > > > _______________________________________________ > > > > Linux-HA mailing list > > > > [email protected] > > > > http://lists.linux-ha.org/mailman/listinfo/linux-ha > > > > See also: http://linux-ha.org/ReportingProblems > > > > > > > > > > > > > > > > -- > > > Serge Dubrouski. > > > > > --- a/heartbeat/pgsql > > > +++ b/heartbeat/pgsql > > > @@ -540,9 +540,13 @@ pgsql_validate_all() { > > > return $OCF_ERR_INSTALLED; > > > fi > > > > > > - if ! runasowner "test -w $OCF_RESKEY_pgdata"; then > > > - ocf_log err "Directory $OCF_RESKEY_pgdata is not writable by > > $OCF_RESKEY_pgdba" > > > - exit $OCF_ERR_PERM; > > > + if ocf_is_probe; then > > > + ocf_log info "Don't check $OCF_RESKEY_pgdata during probe" > > > + else > > > + if ! runasowner "test -w $OCF_RESKEY_pgdata"; then > > > + ocf_log err "Directory $OCF_RESKEY_pgdata is not writable by > > $OCF_RESKEY_pgdba" > > > + exit $OCF_ERR_PERM; > > > + fi > > > fi > > > > > > if [ -n "$OCF_RESKEY_monitor_user" -a ! -n > > "$OCF_RESKEY_monitor_password" ] > > > > > _______________________________________________ > > > Linux-HA mailing list > > > [email protected] > > > http://lists.linux-ha.org/mailman/listinfo/linux-ha > > > See also: http://linux-ha.org/ReportingProblems > > _______________________________________________ > > Linux-HA mailing list > > [email protected] > > http://lists.linux-ha.org/mailman/listinfo/linux-ha > > See also: http://linux-ha.org/ReportingProblems > > > > > > -- > Serge Dubrouski. > diff --git a/heartbeat/pgsql b/heartbeat/pgsql > index f9a882b..eb51c61 100755 > --- a/heartbeat/pgsql > +++ b/heartbeat/pgsql > @@ -536,7 +536,7 @@ pgsql_validate_all() { > > getent passwd $OCF_RESKEY_pgdba >/dev/null 2>&1 > if [ ! $? -eq 0 ]; then > - ocf_log err "User $OCF_RESKEY_pgdba doesn't exit"; > + ocf_log err "User $OCF_RESKEY_pgdba doesn't exist"; > return $OCF_ERR_INSTALLED; > fi > > @@ -545,7 +545,7 @@ pgsql_validate_all() { > else > if ! runasowner "test -w $OCF_RESKEY_pgdata"; then > ocf_log err "Directory $OCF_RESKEY_pgdata is not writable by > $OCF_RESKEY_pgdba" > - exit $OCF_ERR_PERM; > + return $OCF_ERR_PERM; > fi > fi > > _______________________________________________ > Linux-HA mailing list > [email protected] > http://lists.linux-ha.org/mailman/listinfo/linux-ha > See also: http://linux-ha.org/ReportingProblems _______________________________________________ Linux-HA mailing list [email protected] http://lists.linux-ha.org/mailman/listinfo/linux-ha See also: http://linux-ha.org/ReportingProblems
