diff options
author | 2005-08-01 13:34:25 +0000 | |
---|---|---|
committer | 2005-08-01 13:34:25 +0000 | |
commit | e5c82ff1b3fdd8618e09f69430029180f8e26433 (patch) | |
tree | af54893be7f9f8e018c96419b199664579a70c96 /sys-cluster/heartbeat/files | |
parent | nbsmtp-0.99-r1 does not exist anymore (diff) | |
download | gentoo-2-e5c82ff1b3fdd8618e09f69430029180f8e26433.tar.gz gentoo-2-e5c82ff1b3fdd8618e09f69430029180f8e26433.tar.bz2 gentoo-2-e5c82ff1b3fdd8618e09f69430029180f8e26433.zip |
patch split, merged security fix, marked stable on x86. -r2 experimental ebuild with lvm fixes.
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-cluster/heartbeat/files')
-rw-r--r-- | sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2 | 1 | ||||
-rw-r--r-- | sys-cluster/heartbeat/files/heartbeat-1.2.3-lvm.patch | 83 | ||||
-rw-r--r-- | sys-cluster/heartbeat/files/heartbeat-1.2.3-misc_security_fixes.patch (renamed from sys-cluster/heartbeat/files/heartbeat-1.2.3-debian_security_fixes) | 83 |
3 files changed, 84 insertions, 83 deletions
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2 b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2 new file mode 100644 index 000000000000..1db4b5d1aa0a --- /dev/null +++ b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2 @@ -0,0 +1 @@ +MD5 9fd126e5dff51cc8c1eee223c252a4af heartbeat-1.2.3.tar.gz 1772513 diff --git a/sys-cluster/heartbeat/files/heartbeat-1.2.3-lvm.patch b/sys-cluster/heartbeat/files/heartbeat-1.2.3-lvm.patch new file mode 100644 index 000000000000..e81a6c289279 --- /dev/null +++ b/sys-cluster/heartbeat/files/heartbeat-1.2.3-lvm.patch @@ -0,0 +1,83 @@ +--- a/heartbeat/resource.d/LVM.in 20 Apr 2004 05:05:29 -0000 1.2.4.1 ++++ b/heartbeat/resource.d/LVM.in 10 Jun 2005 07:46:28 -0000 +@@ -102,8 +102,15 @@ LVM_methods() { + # + LVM_status() { + +- vgdisplay $1 | grep -i 'Status.*available' >/dev/null +- ++ if ++ [ "$LVM_VERSION" -gt "200" ] ++ then ++ vgdisplay -v $1 | grep -i 'Status[ \t]*available' &>/dev/null ++ return $? ++ else ++ vgdisplay $1 | grep -i 'Status.*available' >/dev/null ++ return $? ++ fi + } + + # +@@ -111,15 +118,27 @@ LVM_status() { + # + LVM_report_status() { + +- VGOUT=`vgdisplay $1 2>&1` ++ if ++ [ "$LVM_VERSION" -gt "200" ] ++ then ++ VGOUT=`vgdisplay -v $1 2>&1` ++ echo "$VGOUT" | grep -i 'Status[ \t]*available' >/dev/null ++ rc=$? ++ else ++ VGOUT=`vgdisplay $1 2>&1` ++ echo "$VGOUT" | grep -i 'Status.*available' >/dev/null ++ rc=$? ++ fi ++ + if +- echo "$VGOUT" | grep -i 'Status.*available' >/dev/null ++ [ $rc -eq 0 ] + then + : Volume $1 is available + else + echo "LVM Volume $1 is not available (stopped)" + return 1 + fi ++ + if + echo "$VGOUT" | grep -i 'Access.*read/write' >/dev/null + then +@@ -155,7 +174,15 @@ LVM_monitor() { + LVM_start() { + + ha_log "Activating volume group $1" +- run vgscan $1 ++ ++ if ++ [ "$LVM_VERSION" -gt "200" ] ++ then ++ run vgscan ++ else ++ run vgscan $1 ++ fi ++ + run vgchange -a y $1 || return 1 + + if +@@ -196,6 +223,15 @@ if + then + LVM_methods + exit $? ++fi ++ ++LVM_VERSION=`LVM_VERSION=`/sbin/lvm version 2> /dev/null | awk '/LVM/ {print $3}' | awk -F"." '{print $1$2}'` ++rc=$? ++if ++ [ $rc -ne 0 ] ++then ++ ha_log "ERROR: LVM: $1 could not determine LVM version" ++ return $rc + fi + + VOLUME=$1 diff --git a/sys-cluster/heartbeat/files/heartbeat-1.2.3-debian_security_fixes b/sys-cluster/heartbeat/files/heartbeat-1.2.3-misc_security_fixes.patch index 1b8992a1bb2a..14a9f7466452 100644 --- a/sys-cluster/heartbeat/files/heartbeat-1.2.3-debian_security_fixes +++ b/sys-cluster/heartbeat/files/heartbeat-1.2.3-misc_security_fixes.patch @@ -200,86 +200,3 @@ unchanged: # # If there is local_giveip script, run it. ---- a/heartbeat/resource.d/LVM.in 20 Apr 2004 05:05:29 -0000 1.2.4.1 -+++ b/heartbeat/resource.d/LVM.in 10 Jun 2005 07:46:28 -0000 -@@ -102,8 +102,15 @@ LVM_methods() { - # - LVM_status() { - -- vgdisplay $1 | grep -i 'Status.*available' >/dev/null -- -+ if -+ [ "$LVM_VERSION" -eq "200" ] -+ then -+ vgdisplay -v $1 | grep -i 'Status[ \t]*available' &>/dev/null -+ return $? -+ else -+ vgdisplay $1 | grep -i 'Status.*available' >/dev/null -+ return $? -+ fi - } - - # -@@ -111,15 +118,27 @@ LVM_status() { - # - LVM_report_status() { - -- VGOUT=`vgdisplay $1 2>&1` -+ if -+ [ "$LVM_VERSION" -eq "200" ] -+ then -+ VGOUT=`vgdisplay -v $1 2>&1` -+ echo "$VGOUT" | grep -i 'Status[ \t]*available' >/dev/null -+ rc=$? -+ else -+ VGOUT=`vgdisplay $1 2>&1` -+ echo "$VGOUT" | grep -i 'Status.*available' >/dev/null -+ rc=$? -+ fi -+ - if -- echo "$VGOUT" | grep -i 'Status.*available' >/dev/null -+ [ $rc -eq 0 ] - then - : Volume $1 is available - else - echo "LVM Volume $1 is not available (stopped)" - return 1 - fi -+ - if - echo "$VGOUT" | grep -i 'Access.*read/write' >/dev/null - then -@@ -155,7 +174,15 @@ LVM_monitor() { - LVM_start() { - - ha_log "Activating volume group $1" -- run vgscan $1 -+ -+ if -+ [ "$LVM_VERSION" -eq "200" ] -+ then -+ run vgscan -+ else -+ run vgscan $1 -+ fi -+ - run vgchange -a y $1 || return 1 - - if -@@ -196,6 +223,15 @@ if - then - LVM_methods - exit $? -+fi -+ -+LVM_VERSION=`/sbin/lvmiopversion` -+rc=$? -+if -+ [ $rc -ne 0 ] -+then -+ ha_log "ERROR: LVM: $1 could not determine LVM version" -+ return $rc - fi - - VOLUME=$1 |