Masato Taruishi
taru****@users*****
2004年 10月 22日 (金) 18:38:54 JST
===================================================================
RCS file: ultrapossum/module/failover/update-failover,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ultrapossum/module/failover/update-failover 2004/10/22 09:06:44 1.24
+++ ultrapossum/module/failover/update-failover 2004/10/22 09:38:54 1.25
@@ -62,7 +62,7 @@
remove_mon_sudoers()
{
if test -f "$SUDOERS"; then
- strip_vaconf $SUDOERS $monid
+ strip_vaconf $SUDOERS $id
chmod 440 $SUDOERS
fi
}
@@ -70,14 +70,14 @@
remove_mon()
{
remove_mon_sudoers
- if test -f "$MONCF"; then strip_vaconf $MONCF $monid; fi
+ if test -f "$MONCF"; then strip_vaconf $MONCF $id; fi
/bin/rm -f $ULTRAPOSSUM_MON_CF
}
configure_heartbeat() {
if test "x$TYPE" = "xmaster" && test "x$BACKUP" != "x"; then
progress "Configuring heartbeat... "
- strip_vaconf $HACF "HACF"
+ strip_vaconf $HACF "$id"
# ha.cf configuration
add_startmark "##" $id > $tmp
@@ -109,15 +109,13 @@
fi
progress "Configuring heartbeat... done"
else
- if test -f $HACF; then strip_vaconf $HACF "HACF"; fi
- if test -f $HARESOURCES; then strip_vaconf $HARESOURCES "HARESOURCES"; fi
+ if test -f $HACF; then strip_vaconf $HACF $id; fi
+ if test -f $HARESOURCES; then strip_vaconf $HARESOURCES $id; fi
fi
}
sanity_fstab() {
- if test `uname` = "SunOS"; then
- :
- else
+ if test $UNAME != "SunOS"; then
if test "x$BACKUP" != "x" &&
! grep "$NFSDEVICE" $FSTAB 2> /dev/null | grep "$NFSDIR" > /dev/null
then
@@ -131,9 +129,7 @@
configure_fstab() {
progress "Configuring NFS... "
- if test `uname` = "SunOS"; then
- :
- else
+ if test $UNAME != "SunOS"; then
if test "x$BACKUP" != "x" && test "x$TYPE" = "xmaster"; then
if ! grep "$NFSDEVICE" $FSTAB 2> /dev/null | grep "$NFSDIR" > /dev/null
then
@@ -150,10 +146,8 @@
}
remove_fstab() {
- if test `uname` = "SunOS"; then
- :
- else
- strip_vaconf $FSTAB "FAILOVER"
+ if test $UNAME != "SunOS"; then
+ strip_vaconf "$FSTAB" $id
fi
}
@@ -248,8 +242,8 @@
remove() {
remove_mon
/bin/rm -f $ULTRAPOSSUM_RECOVERY_CONF
- if test -f "$HACF"; then strip_vaconf $HACF "HACF"; fi
- if test -f $HARESOURCES; then strip_vaconf $HARESOURCES "HARESOURCES"; fi
+ if test -f "$HACF"; then strip_vaconf $HACF $id; fi
+ if test -f $HARESOURCES; then strip_vaconf $HARESOURCES $id; fi
}
case "x$1" in