* [Cluster-devel] cluster/rgmanager/src/resources ip.sh
@ 2007-01-26 20:45 lhh
0 siblings, 0 replies; 5+ messages in thread
From: lhh @ 2007-01-26 20:45 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: lhh at sourceware.org 2007-01-26 20:45:25
Modified files:
rgmanager/src/resources: ip.sh
Log message:
Fix #222484
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/ip.sh.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21&r2=1.21.2.1
--- cluster/rgmanager/src/resources/ip.sh 2006/06/02 17:37:10 1.21
+++ cluster/rgmanager/src/resources/ip.sh 2007/01/26 20:45:25 1.21.2.1
@@ -884,6 +884,9 @@
exit 0
fi
ip_op ${OCF_RESKEY_family} add ${OCF_RESKEY_address}
+ if [ $? -ne 0 ]; then
+ exit $OCF_ERR_GENERIC
+ fi
if [ $NFS_TRICKS -eq 0 ]; then
if [ "$OCF_RESKEY_nfslock" = "yes" ] || \
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Cluster-devel] cluster/rgmanager/src/resources ip.sh
@ 2007-01-26 20:45 lhh
0 siblings, 0 replies; 5+ messages in thread
From: lhh @ 2007-01-26 20:45 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: lhh at sourceware.org 2007-01-26 20:45:51
Modified files:
rgmanager/src/resources: ip.sh
Log message:
Fix #222484
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/ip.sh.diff?cvsroot=cluster&r1=1.21&r2=1.22
--- cluster/rgmanager/src/resources/ip.sh 2006/06/02 17:37:10 1.21
+++ cluster/rgmanager/src/resources/ip.sh 2007/01/26 20:45:51 1.22
@@ -884,6 +884,9 @@
exit 0
fi
ip_op ${OCF_RESKEY_family} add ${OCF_RESKEY_address}
+ if [ $? -ne 0 ]; then
+ exit $OCF_ERR_GENERIC
+ fi
if [ $NFS_TRICKS -eq 0 ]; then
if [ "$OCF_RESKEY_nfslock" = "yes" ] || \
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Cluster-devel] cluster/rgmanager/src/resources ip.sh
@ 2007-04-27 17:56 lhh
0 siblings, 0 replies; 5+ messages in thread
From: lhh @ 2007-04-27 17:56 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: lhh at sourceware.org 2007-04-27 18:56:06
Modified files:
rgmanager/src/resources: ip.sh
Log message:
Re-fix #222484
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/ip.sh.diff?cvsroot=cluster&r1=1.24&r2=1.25
--- cluster/rgmanager/src/resources/ip.sh 2007/04/19 17:53:05 1.24
+++ cluster/rgmanager/src/resources/ip.sh 2007/04/27 17:56:06 1.25
@@ -884,6 +884,9 @@
exit 0
fi
ip_op ${OCF_RESKEY_family} add ${OCF_RESKEY_address}
+ if [ $? -ne 0 ]; then
+ exit $OCF_ERR_GENERIC
+ fi
if [ $NFS_TRICKS -eq 0 ]; then
if [ "$OCF_RESKEY_nfslock" = "yes" ] || \
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Cluster-devel] cluster/rgmanager/src/resources ip.sh
@ 2007-06-04 11:01 mgrac
0 siblings, 0 replies; 5+ messages in thread
From: mgrac @ 2007-06-04 11:01 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: mgrac at sourceware.org 2007-06-04 11:01:35
Modified files:
rgmanager/src/resources: ip.sh
Log message:
Bug: 212479 - ip.sh causes /sbin/ip to produce warnings
Missing netmask is parsed from /sbin/ip
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/ip.sh.diff?cvsroot=cluster&r1=1.25&r2=1.26
--- cluster/rgmanager/src/resources/ip.sh 2007/04/27 17:56:06 1.25
+++ cluster/rgmanager/src/resources/ip.sh 2007/06/04 11:01:34 1.26
@@ -698,6 +698,7 @@
if [ "${addr/\/*/}" != "$ifaddr" ]; then
continue
fi
+ addr=`/sbin/ip addr list | grep "$addr" | head -n 1 | awk '{print $2}'`
ocf_log info "Removing IPv4 address $addr from $dev"
fi
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Cluster-devel] cluster/rgmanager/src/resources ip.sh
@ 2007-06-04 11:09 mgrac
0 siblings, 0 replies; 5+ messages in thread
From: mgrac @ 2007-06-04 11:09 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: mgrac at sourceware.org 2007-06-04 11:09:17
Modified files:
rgmanager/src/resources: ip.sh
Log message:
Bug: 212479 - ip.sh causes /sbin/ip to produce warnings
Missing netmask is parsed from /sbin/ip
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/ip.sh.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.3&r2=1.21.2.4
--- cluster/rgmanager/src/resources/ip.sh 2007/05/02 18:28:52 1.21.2.3
+++ cluster/rgmanager/src/resources/ip.sh 2007/06/04 11:09:17 1.21.2.4
@@ -698,6 +698,7 @@
if [ "${addr/\/*/}" != "$ifaddr" ]; then
continue
fi
+ addr=`/sbin/ip addr list | grep "$addr" | head -n 1 | awk '{print $2}'`
ocf_log info "Removing IPv4 address $addr from $dev"
fi
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-06-04 11:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-04 11:09 [Cluster-devel] cluster/rgmanager/src/resources ip.sh mgrac
-- strict thread matches above, loose matches on Subject: below --
2007-06-04 11:01 mgrac
2007-04-27 17:56 lhh
2007-01-26 20:45 lhh
2007-01-26 20:45 lhh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).