• R/O
  • SSH

pm_diskd: Commit

※ リポジトリは、pm-diskd ブランチが https://github.com/linux-ha-japan/pm_diskd-1.0 へ、pm-diskd-2.0ブランチが https://github.com/linux-ha-japan/pm_diskd へ移行しました。

Pacemaker 対応ディスク故障監視機能。

Pacemaker-1.0公式リポジトリのクローンに対し、パッチ作成用のブランチを作成して管理する。
ブランチ名: pm-diskd

初回 hg clone 実行後は、hg update -r pm-diskd を実行すること。

Heartbeat-2.1.4 用 hb-diskd(*) のPacemaker対応版
(*) http://sourceforge.jp/projects/linux-ha/releases/?package_id=10555


Commit MetaInfo

Revision510ff3f9d7a9c1804a701a9bd228d62822fe78d5 (tree)
Time2013-02-19 08:52:08
AuthorYuusuke Iida <iidayuus@inte...>
CommiterYuusuke Iida

Log Message

removed the unnecessary code.

Change Summary

Incremental Difference

diff -r c0120717ece7 -r 510ff3f9d7a9 configure.ac
--- a/configure.ac Tue Feb 19 14:33:39 2013 +0900
+++ b/configure.ac Tue Feb 19 08:52:08 2013 +0900
@@ -2,7 +2,7 @@
22 # Process this file with autoconf to produce a configure script.
33
44 AC_PREREQ([2.53])
5-AC_INIT([pm_diskd], [2.0], BUG-REPORT-ADDRESS)
5+AC_INIT([pm_diskd], [2.0], [iidayuus@intellilink.co.jp])
66 AM_INIT_AUTOMAKE
77
88 # Checks for programs.
@@ -83,20 +83,14 @@
8383 fi
8484 CPPFLAGS="$CPPFLAGS $XML2HEAD"
8585
86-
87-#CFLAGS="$CFLAGS -I${prefix}/include/glib-2.0"
88-#CFLAGS="$CFLAGS -I${prefix}/lib64/glib-2.0/include"
89-
9086 if test "$ac_cv_header_pacemaker_crm_config_h" = "yes"; then
9187 CFLAGS="$CFLAGS -I${prefix}/include/pacemaker"
9288 fi
9389
9490 OCF_ROOT_DIR=`extract_header_define crm/services.h OCF_ROOT_DIR`
95-#AC_DEFINE_UNQUOTED(OCF_ROOT_DIR,"$OCF_ROOT_DIR", ocf resource directory)
9691 AC_SUBST(OCF_ROOT_DIR)
9792
9893 CRM_DAEMON_DIR=`extract_header_define crm_config.h CRM_DAEMON_DIR`
99-#AC_DEFINE_UNQUOTED(CRM_DAEMON_DIR,"$CRM_DAEMON_DIR", crm daemon directory)
10094 AC_SUBST(CRM_DAEMON_DIR)
10195
10296
diff -r c0120717ece7 -r 510ff3f9d7a9 pm_diskd.spec.in
--- a/pm_diskd.spec.in Tue Feb 19 14:33:39 2013 +0900
+++ b/pm_diskd.spec.in Tue Feb 19 08:52:08 2013 +0900
@@ -29,8 +29,6 @@
2929 %description
3030 pacemaker diskcheck service
3131 for pacemaker 1.1.8
32- and
33- cluster-glue 1.0.11
3432
3533 ########################################
3634 %prep
diff -r c0120717ece7 -r 510ff3f9d7a9 tools/Makefile.am
--- a/tools/Makefile.am Tue Feb 19 14:33:39 2013 +0900
+++ b/tools/Makefile.am Tue Feb 19 08:52:08 2013 +0900
@@ -6,12 +6,6 @@
66 # BUILD
77
88 diskd_SOURCES = diskd.c
9-#diskd_LDADD = -lgthread-2.0
10-
11-#diskd_LDADD = -lcrmcommon \
12-# -lgthread-2.0 \
13-# -lcrmcluster
14-
159
1610 AM_CFLAGS = -Wall -Werror
1711
diff -r c0120717ece7 -r 510ff3f9d7a9 tools/diskd.c
--- a/tools/diskd.c Tue Feb 19 14:33:39 2013 +0900
+++ b/tools/diskd.c Tue Feb 19 08:52:08 2013 +0900
@@ -22,7 +22,7 @@
2222 */
2323
2424 /**
25- * Ver.2.0 for Pacemaker 1.0.x
25+ * Ver.2.0 for Pacemaker 1.1.x
2626 */
2727
2828 #include <sys/param.h>
Show on old repository browser