[Cluster-devel] conga luci/init.d/luci luci/site/luci/var/cert ...
CVSROOT:/cvs/cluster Module name:conga Branch: RHEL4 Changes by: [EMAIL PROTECTED] 2008-04-11 06:30:25 Modified files: luci/init.d: luci luci/site/luci/var/certs: cacert.config make : version.in Log message: Fix typo Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/init.d/luci.diff?cvsroot=clusteronly_with_tag=RHEL4r1=1.14.2.3r2=1.14.2.4 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/certs/cacert.config.diff?cvsroot=clusteronly_with_tag=RHEL4r1=1.1.4.1r2=1.1.4.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=clusteronly_with_tag=RHEL4r1=1.28.2.10r2=1.28.2.11 --- conga/luci/init.d/luci 2008/04/10 22:13:49 1.14.2.3 +++ conga/luci/init.d/luci 2008/04/11 06:30:24 1.14.2.4 @@ -75,7 +75,7 @@ rm -f -- $HTTPS_PRIVKEY $HTTPS_PUBKEY /usr/bin/openssl genrsa -out $HTTPS_PRIVKEY $KEY_BITS /dev/null - /usr/bin/openssl req -new -x509 -key $HTTPS_PRIVKEY -out $HTTPS_PUBKEY -days $KEY_LIFE_DAYS -set-serial $(/bin/date +%s) -config /var/lib/luci/var/certs/cacert.config + /usr/bin/openssl req -new -x509 -key $HTTPS_PRIVKEY -out $HTTPS_PUBKEY -days $KEY_LIFE_DAYS -set_serial $(/bin/date +%s) -config /var/lib/luci/var/certs/cacert.config /bin/chmod -- 600 $HTTPS_PRIVKEY /bin/chmod -- 644 $HTTPS_PUBKEY /bin/chown -- $LUCI_USER:$LUCI_GROUP $HTTPS_PRIVKEY $HTTPS_PUBKEY --- conga/luci/site/luci/var/certs/cacert.config2008/04/10 22:13:49 1.1.4.1 +++ conga/luci/site/luci/var/certs/cacert.config2008/04/11 06:30:25 1.1.4.2 @@ -9,7 +9,7 @@ L = Conga O = Conga OU = Conga -CN = Luci Server +CN = luci server emailAddress = [EMAIL PROTECTED] [ req_attributes ] --- conga/make/version.in 2008/04/07 20:11:44 1.28.2.10 +++ conga/make/version.in 2008/04/11 06:30:25 1.28.2.11 @@ -1,2 +1,2 @@ VERSION=0.11.1 -RELEASE=1 +RELEASE=2
[Cluster-devel] conga ./conga.spec.in.in luci/cluster/fence-ma ...
CVSROOT:/cvs/cluster Module name:conga Branch: RHEL5 Changes by: [EMAIL PROTECTED] 2008-04-11 06:50:33 Modified files: . : conga.spec.in.in luci/cluster : fence-macros luci/init.d: luci luci/site/luci/var/certs: cacert.config luci/utils : luci_admin Log message: Fix 441573: nodename field for fence_scsi disabled when adding a new fence device/instance Generate serial numbers for self-signed certs to avoid Firefox locking us out in certain situations. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.45.2.75r2=1.45.2.76 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence-macros.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.2.2.1r2=1.2.2.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/init.d/luci.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.11.2.4r2=1.11.2.5 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/certs/cacert.config.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.1r2=1.1.2.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/utils/luci_admin.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.50.2.6r2=1.50.2.7 --- conga/conga.spec.in.in 2008/03/24 23:18:22 1.45.2.75 +++ conga/conga.spec.in.in 2008/04/11 06:50:32 1.45.2.76 @@ -291,6 +291,9 @@ ### changelog ### %changelog +* Thu Apr 10 2008 Ryan McCabe [EMAIL PROTECTED] 0.12.0-7 +- Fix bz441573 (nodename field for fence_scsi disabled when adding a new fence device/instance) + * Wed Feb 27 2008 Ryan McCabe [EMAIL PROTECTED] 0.12.0-6 - Fix bz434586 (Resource tree does not display multiple children of a parent correctly) - Fix bz304931 (Rich Sybase resource agent configuration support) --- conga/luci/cluster/fence-macros 2008/01/23 04:44:30 1.2.2.1 +++ conga/luci/cluster/fence-macros 2008/04/11 06:50:32 1.2.2.2 @@ -1849,7 +1849,7 @@ tr tdNode name/td td - input type=text name=node disabled=disabled + input type=text name=node tal:attributes=value request/node | nothing / /td /tr --- conga/luci/init.d/luci 2008/02/07 06:52:56 1.11.2.4 +++ conga/luci/init.d/luci 2008/04/11 06:50:32 1.11.2.5 @@ -75,7 +75,7 @@ rm -f -- $HTTPS_PRIVKEY $HTTPS_PUBKEY /usr/bin/openssl genrsa -out $HTTPS_PRIVKEY $KEY_BITS /dev/null - /usr/bin/openssl req -new -x509 -key $HTTPS_PRIVKEY -out $HTTPS_PUBKEY -days $KEY_LIFE_DAYS -config /var/lib/luci/var/certs/cacert.config + /usr/bin/openssl req -new -x509 -key $HTTPS_PRIVKEY -out $HTTPS_PUBKEY -days $KEY_LIFE_DAYS -set_serial $(/bin/date +%s) -config /var/lib/luci/var/certs/cacert.config /bin/chmod -- 600 $HTTPS_PRIVKEY /bin/chmod -- 644 $HTTPS_PUBKEY /bin/chown -- $LUCI_USER:$LUCI_GROUP $HTTPS_PRIVKEY $HTTPS_PUBKEY --- conga/luci/site/luci/var/certs/cacert.config2006/06/02 00:14:28 1.1 +++ conga/luci/site/luci/var/certs/cacert.config2008/04/11 06:50:33 1.1.2.1 @@ -6,10 +6,10 @@ [ req_distinguished_name ] C = US ST = State or Province -L = Locality -O = Organization Name -OU = Organizational Unit Name -CN = Common Name -emailAddress = [EMAIL PROTECTED] +L = Conga +O = Conga +OU = Conga +CN = luci server +emailAddress = [EMAIL PROTECTED] [ req_attributes ] --- conga/luci/utils/luci_admin 2008/01/23 04:44:57 1.50.2.6 +++ conga/luci/utils/luci_admin 2008/04/11 06:50:33 1.50.2.7 @@ -10,6 +10,7 @@ import sys, os, pwd from select import select from stat import S_ISREG +from time import time import types import xml import xml.dom @@ -1051,7 +1052,7 @@ # /usr/bin/openssl req -new -x509 -key /var/lib/luci/var/certs/privkey.pem -out /var/lib/luci/var/certs/cacert.pem -days 1825 -config /var/lib/luci/var/certs/cacert.config command = '/usr/bin/openssl' - args = [ command, 'req', '-new', '-x509', '-key', SSL_PRIVKEY_PATH, '-out', SSL_PUBKEY_PATH, '-days', '1825', '-config', SSL_KEYCONFIG_PATH ] + args = [ command, 'req', '-new', '-x509', '-key', SSL_PRIVKEY_PATH, '-out', SSL_PUBKEY_PATH, '-days', '1825', '-set_serial', str(int(time())), '-config', SSL_KEYCONFIG_PATH ] exec_cmd(command, args) # take ownership and restrict access
[Cluster-devel] conga ./clustermon.spec.in.in ./conga.spec.in. ...
CVSROOT:/cvs/cluster Module name:conga Branch: RHEL5 Changes by: [EMAIL PROTECTED] 2008-04-11 06:54:44 Modified files: . : clustermon.spec.in.in conga.spec.in.in make : version.in Log message: Update changelogs and bump the version Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.18.2.36r2=1.18.2.37 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.45.2.76r2=1.45.2.77 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=clusteronly_with_tag=RHEL5r1=1.21.2.36r2=1.21.2.37 --- conga/clustermon.spec.in.in 2008/03/31 17:23:45 1.18.2.36 +++ conga/clustermon.spec.in.in 2008/04/11 06:54:43 1.18.2.37 @@ -212,6 +212,9 @@ %changelog +* Thu Apr 10 2008 Ryan McCabe [EMAIL PROTECTED] 0.12.0-8 +- Fix bz441947 (cluster-snmp dlopen failure) + * Thu Mar 27 2008 Ryan McCabe [EMAIL PROTECTED] 0.12.0-7 - Fix bz439186 --- conga/conga.spec.in.in 2008/04/11 06:50:32 1.45.2.76 +++ conga/conga.spec.in.in 2008/04/11 06:54:43 1.45.2.77 @@ -291,7 +291,7 @@ ### changelog ### %changelog -* Thu Apr 10 2008 Ryan McCabe [EMAIL PROTECTED] 0.12.0-7 +* Thu Apr 10 2008 Ryan McCabe [EMAIL PROTECTED] 0.12.0-8 - Fix bz441573 (nodename field for fence_scsi disabled when adding a new fence device/instance) * Wed Feb 27 2008 Ryan McCabe [EMAIL PROTECTED] 0.12.0-6 --- conga/make/version.in 2008/03/28 01:15:16 1.21.2.36 +++ conga/make/version.in 2008/04/11 06:54:43 1.21.2.37 @@ -1,2 +1,2 @@ VERSION=0.12.0 -RELEASE=7 +RELEASE=8
[Cluster-devel] Cluster Project branch, master, updated. gfs-kernel_0_1_22-155-g56e13f4
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=56e13f474bc8abf02324e294462527755f8752f4 The branch, master has been updated via 56e13f474bc8abf02324e294462527755f8752f4 (commit) via f0454169acbc4190d2c902a1b25cab35282351d5 (commit) via 19e98c46738e96f8aa2c4c1719075d8a4d369518 (commit) via 0e66ec5001902c704aadc0f6224ce3391ed643c6 (commit) from 9fecacd358dba0a191f29e7932281fc862a6ec33 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 56e13f474bc8abf02324e294462527755f8752f4 Author: Bob Peterson [EMAIL PROTECTED] Date: Thu Apr 10 10:45:47 2008 -0500 Fix some compiler warnings in gfs2_edit commit f0454169acbc4190d2c902a1b25cab35282351d5 Author: Bob Peterson [EMAIL PROTECTED] Date: Thu Apr 10 10:45:47 2008 -0500 gfs2_edit was not recalculating the max block size after it figured that out. commit 19e98c46738e96f8aa2c4c1719075d8a4d369518 Author: Bob Peterson [EMAIL PROTECTED] Date: Tue Mar 18 15:44:24 2008 -0500 Fix gfs2_edit print options (-p) to work properly for gfs-1 rgs and rindex. Also fixed rgflags option for gfs1. commit 0e66ec5001902c704aadc0f6224ce3391ed643c6 Author: Bob Peterson [EMAIL PROTECTED] Date: Tue Mar 11 18:18:43 2008 -0500 Fix savemeta so it saves gfs-1 rg information properly Also add savergs option to facilitate rg-only repairs. --- Summary of changes: gfs2/edit/gfs2hex.c | 12 ++-- gfs2/edit/hexedit.c | 178 +- gfs2/edit/hexedit.h | 32 + gfs2/edit/savemeta.c | 38 +++ 4 files changed, 210 insertions(+), 50 deletions(-) diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c index dfd6c03..7262d78 100644 --- a/gfs2/edit/gfs2hex.c +++ b/gfs2/edit/gfs2hex.c @@ -70,9 +70,9 @@ void print_gfs2(const char *fmt, ...) va_start(args, fmt); vsprintf(string, fmt, args); if (termlines) - printw(string); + printw(%s, string); else - printf(string); + printf(%s, string); va_end(args); } @@ -127,9 +127,9 @@ void print_it(const char *label, const char *fmt, const char *fmt2, ...) vsprintf(tmp_string, fmt, args); if (termlines) - printw(tmp_string); + printw(%s, tmp_string); else - printf(tmp_string); + printf(%s, tmp_string); check_highlight(FALSE); if (fmt2) { @@ -159,10 +159,10 @@ void print_it(const char *label, const char *fmt, const char *fmt2, ...) fmtstring=(decimal); if (termlines) { move(line, 50); - printw(fmtstring); + printw(%s, fmtstring); } else - printf(fmtstring); + printf(%s, fmtstring); } if (termlines) { refresh(); diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index bd4f917..07edf81 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -387,7 +387,7 @@ int display_block_type(const char *lpBuffer, int from_restore) } if (block == RGLIST_DUMMY_BLOCK) { ret_type = GFS2_METATYPE_RG; - struct_len = sizeof(struct gfs2_rgrp); + struct_len = gfs1 ? sizeof(struct gfs_rgrp) : sizeof(struct gfs2_rgrp); } else if ((ret_type = get_block_type(lpBuffer))) { switch (*(lpBuffer+7)) { @@ -618,6 +618,17 @@ uint64_t masterblock(const char *fn) } /* */ +/* risize - size of one rindex entry, whether gfs1 or gfs2 */ +/* */ +static int risize(void) +{ + if (gfs1) + return sizeof(struct gfs_rindex); + else + return sizeof(struct gfs2_rindex); +} + +/* */ /* rgcount - return how many rgrps there are. */ /* */ void rgcount(void) @@ -633,7 +644,7 @@ void rgcount(void) ribh = bread(sbd, block); riinode = inode_get(sbd, ribh);
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.02.00-62-g819fddb
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=819fddbffaf73550a046f79e78d5147f0e8b9030 The branch, STABLE2 has been updated via 819fddbffaf73550a046f79e78d5147f0e8b9030 (commit) via acf6100f3e0f2eefe73019d5a1b2d18cd59ea093 (commit) via 755a9a68e99b29856aef856df8ab5a1af46b65ed (commit) via 40cd555c21891563f67411175854a00fbb704b25 (commit) from a3ff336f79cabcb020c750cb569de0872bf3e05d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 819fddbffaf73550a046f79e78d5147f0e8b9030 Author: Bob Peterson [EMAIL PROTECTED] Date: Thu Apr 10 10:45:47 2008 -0500 Fix some compiler warnings in gfs2_edit commit acf6100f3e0f2eefe73019d5a1b2d18cd59ea093 Author: Bob Peterson [EMAIL PROTECTED] Date: Thu Apr 10 10:45:47 2008 -0500 gfs2_edit was not recalculating the max block size after it figured that out. commit 755a9a68e99b29856aef856df8ab5a1af46b65ed Author: Bob Peterson [EMAIL PROTECTED] Date: Tue Mar 18 15:44:24 2008 -0500 Fix gfs2_edit print options (-p) to work properly for gfs-1 rgs and rindex. Also fixed rgflags option for gfs1. commit 40cd555c21891563f67411175854a00fbb704b25 Author: Bob Peterson [EMAIL PROTECTED] Date: Tue Mar 11 18:18:43 2008 -0500 Fix savemeta so it saves gfs-1 rg information properly Also add savergs option to facilitate rg-only repairs. --- Summary of changes: gfs2/edit/gfs2hex.c | 12 ++-- gfs2/edit/hexedit.c | 178 +- gfs2/edit/hexedit.h | 32 + gfs2/edit/savemeta.c | 38 +++ 4 files changed, 210 insertions(+), 50 deletions(-) diff --git a/gfs2/edit/gfs2hex.c b/gfs2/edit/gfs2hex.c index dfd6c03..7262d78 100644 --- a/gfs2/edit/gfs2hex.c +++ b/gfs2/edit/gfs2hex.c @@ -70,9 +70,9 @@ void print_gfs2(const char *fmt, ...) va_start(args, fmt); vsprintf(string, fmt, args); if (termlines) - printw(string); + printw(%s, string); else - printf(string); + printf(%s, string); va_end(args); } @@ -127,9 +127,9 @@ void print_it(const char *label, const char *fmt, const char *fmt2, ...) vsprintf(tmp_string, fmt, args); if (termlines) - printw(tmp_string); + printw(%s, tmp_string); else - printf(tmp_string); + printf(%s, tmp_string); check_highlight(FALSE); if (fmt2) { @@ -159,10 +159,10 @@ void print_it(const char *label, const char *fmt, const char *fmt2, ...) fmtstring=(decimal); if (termlines) { move(line, 50); - printw(fmtstring); + printw(%s, fmtstring); } else - printf(fmtstring); + printf(%s, fmtstring); } if (termlines) { refresh(); diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index bd4f917..07edf81 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -387,7 +387,7 @@ int display_block_type(const char *lpBuffer, int from_restore) } if (block == RGLIST_DUMMY_BLOCK) { ret_type = GFS2_METATYPE_RG; - struct_len = sizeof(struct gfs2_rgrp); + struct_len = gfs1 ? sizeof(struct gfs_rgrp) : sizeof(struct gfs2_rgrp); } else if ((ret_type = get_block_type(lpBuffer))) { switch (*(lpBuffer+7)) { @@ -618,6 +618,17 @@ uint64_t masterblock(const char *fn) } /* */ +/* risize - size of one rindex entry, whether gfs1 or gfs2 */ +/* */ +static int risize(void) +{ + if (gfs1) + return sizeof(struct gfs_rindex); + else + return sizeof(struct gfs2_rindex); +} + +/* */ /* rgcount - return how many rgrps there are. */ /* */ void rgcount(void) @@ -633,7 +644,7 @@ void rgcount(void) ribh = bread(sbd, block); riinode = inode_get(sbd, ribh);
[Cluster-devel] Cluster Project branch, master, updated. gfs-kernel_0_1_22-156-gd2a926d
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=d2a926d2122c23e6175a62326b5e2b421b842a93 The branch, master has been updated via d2a926d2122c23e6175a62326b5e2b421b842a93 (commit) from 56e13f474bc8abf02324e294462527755f8752f4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit d2a926d2122c23e6175a62326b5e2b421b842a93 Author: Abhijith Das [EMAIL PROTECTED] Date: Fri Apr 11 09:10:47 2008 -0500 gfs2_tool: Fix build warnings in misc.c bz 441636 gfs2_tool used to include both linux/fs.h and sys/mount.h that caused some symbols to be defined twice and hence caused some build warnings. This patch uses linux/ext3_fs.h instead of /linux/fs.h and uses EXT3_XXX_FL inode flags instead of the respective FS_XXX_FL flags. This patch also removes the SYSTEM and DIRECTIO flags as they are not used anymore. --- Summary of changes: gfs2/tool/misc.c | 28 +++- 1 files changed, 11 insertions(+), 17 deletions(-) diff --git a/gfs2/tool/misc.c b/gfs2/tool/misc.c index 1d46e1d..555976b 100644 --- a/gfs2/tool/misc.c +++ b/gfs2/tool/misc.c @@ -29,7 +29,7 @@ #define __user #include linux/gfs2_ondisk.h #include sys/mount.h -#include linux/fs.h +#include linux/ext3_fs.h #include libgfs2.h #include gfs2_tool.h @@ -198,16 +198,12 @@ print_flags(struct gfs2_dinode *di) { if (di-di_flags) { printf(Flags:\n); - if (di-di_flags GFS2_DIF_SYSTEM) - printf( system\n); if (di-di_flags GFS2_DIF_JDATA) printf( jdata\n); if (di-di_flags GFS2_DIF_EXHASH) printf( exhash\n); if (di-di_flags GFS2_DIF_EA_INDIRECT) printf( ea_indirect\n); - if (di-di_flags GFS2_DIF_DIRECTIO) - printf( directio\n); if (di-di_flags GFS2_DIF_IMMUTABLE) printf( immutable\n); if (di-di_flags GFS2_DIF_APPENDONLY) @@ -228,20 +224,18 @@ print_flags(struct gfs2_dinode *di) static unsigned int get_flag_from_name(char *name) { - if (strncmp(name, system, 6) == 0) - return GFS2_DIF_SYSTEM; - else if (strncmp(name, jdata, 5) == 0) - return FS_JOURNAL_DATA_FL; - else if (strncmp(name, directio, 8) == 0) - return FS_DIRECTIO_FL; + if (strncmp(name, jdata, 5) == 0) + return EXT3_JOURNAL_DATA_FL; + else if (strncmp(name, exhash, 6) == 0) + return EXT3_INDEX_FL; else if (strncmp(name, immutable, 9) == 0) - return FS_IMMUTABLE_FL; + return EXT3_IMMUTABLE_FL; else if (strncmp(name, appendonly, 10) == 0) - return FS_APPEND_FL; + return EXT3_APPEND_FL; else if (strncmp(name, noatime, 7) == 0) - return FS_NOATIME_FL; + return EXT3_NOATIME_FL; else if (strncmp(name, sync, 4) == 0) - return FS_SYNC_FL; + return EXT3_SYNC_FL; else return 0; } @@ -276,13 +270,13 @@ set_flag(int argc, char **argv) if (fd 0) die(can't open %s: %s\n, argv[optind], strerror(errno)); /* first get the existing flags on the file */ - error = ioctl(fd, FS_IOC_GETFLAGS, newflags); + error = ioctl(fd, EXT3_IOC_GETFLAGS, newflags); if (error) die(can't get flags on %s: %s\n, argv[optind], strerror(errno)); newflags = set ? newflags | flag : newflags ~flag; /* new flags */ - error = ioctl(fd, FS_IOC_SETFLAGS, newflags); + error = ioctl(fd, EXT3_IOC_SETFLAGS, newflags); if (error) die(can't set flags on %s: %s\n, argv[optind], strerror(errno)); hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.02.00-63-ge392259
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=e3922593271e97d91e69944a9675d2216e62a186 The branch, STABLE2 has been updated via e3922593271e97d91e69944a9675d2216e62a186 (commit) from 819fddbffaf73550a046f79e78d5147f0e8b9030 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit e3922593271e97d91e69944a9675d2216e62a186 Author: Abhijith Das [EMAIL PROTECTED] Date: Fri Apr 11 09:10:47 2008 -0500 gfs2_tool: Fix build warnings in misc.c bz 441636 gfs2_tool used to include both linux/fs.h and sys/mount.h that caused some symbols to be defined twice and hence caused some build warnings. This patch uses linux/ext3_fs.h instead of /linux/fs.h and uses EXT3_XXX_FL inode flags instead of the respective FS_XXX_FL flags. This patch also removes the SYSTEM and DIRECTIO flags as they are not used anymore. --- Summary of changes: gfs2/tool/misc.c | 28 +++- 1 files changed, 11 insertions(+), 17 deletions(-) diff --git a/gfs2/tool/misc.c b/gfs2/tool/misc.c index 1d46e1d..555976b 100644 --- a/gfs2/tool/misc.c +++ b/gfs2/tool/misc.c @@ -29,7 +29,7 @@ #define __user #include linux/gfs2_ondisk.h #include sys/mount.h -#include linux/fs.h +#include linux/ext3_fs.h #include libgfs2.h #include gfs2_tool.h @@ -198,16 +198,12 @@ print_flags(struct gfs2_dinode *di) { if (di-di_flags) { printf(Flags:\n); - if (di-di_flags GFS2_DIF_SYSTEM) - printf( system\n); if (di-di_flags GFS2_DIF_JDATA) printf( jdata\n); if (di-di_flags GFS2_DIF_EXHASH) printf( exhash\n); if (di-di_flags GFS2_DIF_EA_INDIRECT) printf( ea_indirect\n); - if (di-di_flags GFS2_DIF_DIRECTIO) - printf( directio\n); if (di-di_flags GFS2_DIF_IMMUTABLE) printf( immutable\n); if (di-di_flags GFS2_DIF_APPENDONLY) @@ -228,20 +224,18 @@ print_flags(struct gfs2_dinode *di) static unsigned int get_flag_from_name(char *name) { - if (strncmp(name, system, 6) == 0) - return GFS2_DIF_SYSTEM; - else if (strncmp(name, jdata, 5) == 0) - return FS_JOURNAL_DATA_FL; - else if (strncmp(name, directio, 8) == 0) - return FS_DIRECTIO_FL; + if (strncmp(name, jdata, 5) == 0) + return EXT3_JOURNAL_DATA_FL; + else if (strncmp(name, exhash, 6) == 0) + return EXT3_INDEX_FL; else if (strncmp(name, immutable, 9) == 0) - return FS_IMMUTABLE_FL; + return EXT3_IMMUTABLE_FL; else if (strncmp(name, appendonly, 10) == 0) - return FS_APPEND_FL; + return EXT3_APPEND_FL; else if (strncmp(name, noatime, 7) == 0) - return FS_NOATIME_FL; + return EXT3_NOATIME_FL; else if (strncmp(name, sync, 4) == 0) - return FS_SYNC_FL; + return EXT3_SYNC_FL; else return 0; } @@ -276,13 +270,13 @@ set_flag(int argc, char **argv) if (fd 0) die(can't open %s: %s\n, argv[optind], strerror(errno)); /* first get the existing flags on the file */ - error = ioctl(fd, FS_IOC_GETFLAGS, newflags); + error = ioctl(fd, EXT3_IOC_GETFLAGS, newflags); if (error) die(can't get flags on %s: %s\n, argv[optind], strerror(errno)); newflags = set ? newflags | flag : newflags ~flag; /* new flags */ - error = ioctl(fd, FS_IOC_SETFLAGS, newflags); + error = ioctl(fd, EXT3_IOC_SETFLAGS, newflags); if (error) die(can't set flags on %s: %s\n, argv[optind], strerror(errno)); hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-40-gb0d53e9
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=b0d53e957419d279f5b1846d29160d150f1d02d2 The branch, RHEL5 has been updated via b0d53e957419d279f5b1846d29160d150f1d02d2 (commit) from 73916dd1f4ce1fa237a8e01e682e6380132edeeb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit b0d53e957419d279f5b1846d29160d150f1d02d2 Author: Abhijith Das [EMAIL PROTECTED] Date: Fri Apr 11 09:10:47 2008 -0500 gfs2_tool: Fix build warnings in misc.c bz 441636 gfs2_tool used to include both linux/fs.h and sys/mount.h that caused some symbols to be defined twice and hence caused some build warnings. This patch uses linux/ext3_fs.h instead of /linux/fs.h and uses EXT3_XXX_FL inode flags instead of the respective FS_XXX_FL flags. This patch also removes the SYSTEM and DIRECTIO flags as they are not used anymore. --- Summary of changes: gfs2/tool/misc.c | 28 +++- 1 files changed, 11 insertions(+), 17 deletions(-) diff --git a/gfs2/tool/misc.c b/gfs2/tool/misc.c index 1d46e1d..555976b 100644 --- a/gfs2/tool/misc.c +++ b/gfs2/tool/misc.c @@ -29,7 +29,7 @@ #define __user #include linux/gfs2_ondisk.h #include sys/mount.h -#include linux/fs.h +#include linux/ext3_fs.h #include libgfs2.h #include gfs2_tool.h @@ -198,16 +198,12 @@ print_flags(struct gfs2_dinode *di) { if (di-di_flags) { printf(Flags:\n); - if (di-di_flags GFS2_DIF_SYSTEM) - printf( system\n); if (di-di_flags GFS2_DIF_JDATA) printf( jdata\n); if (di-di_flags GFS2_DIF_EXHASH) printf( exhash\n); if (di-di_flags GFS2_DIF_EA_INDIRECT) printf( ea_indirect\n); - if (di-di_flags GFS2_DIF_DIRECTIO) - printf( directio\n); if (di-di_flags GFS2_DIF_IMMUTABLE) printf( immutable\n); if (di-di_flags GFS2_DIF_APPENDONLY) @@ -228,20 +224,18 @@ print_flags(struct gfs2_dinode *di) static unsigned int get_flag_from_name(char *name) { - if (strncmp(name, system, 6) == 0) - return GFS2_DIF_SYSTEM; - else if (strncmp(name, jdata, 5) == 0) - return FS_JOURNAL_DATA_FL; - else if (strncmp(name, directio, 8) == 0) - return FS_DIRECTIO_FL; + if (strncmp(name, jdata, 5) == 0) + return EXT3_JOURNAL_DATA_FL; + else if (strncmp(name, exhash, 6) == 0) + return EXT3_INDEX_FL; else if (strncmp(name, immutable, 9) == 0) - return FS_IMMUTABLE_FL; + return EXT3_IMMUTABLE_FL; else if (strncmp(name, appendonly, 10) == 0) - return FS_APPEND_FL; + return EXT3_APPEND_FL; else if (strncmp(name, noatime, 7) == 0) - return FS_NOATIME_FL; + return EXT3_NOATIME_FL; else if (strncmp(name, sync, 4) == 0) - return FS_SYNC_FL; + return EXT3_SYNC_FL; else return 0; } @@ -276,13 +270,13 @@ set_flag(int argc, char **argv) if (fd 0) die(can't open %s: %s\n, argv[optind], strerror(errno)); /* first get the existing flags on the file */ - error = ioctl(fd, FS_IOC_GETFLAGS, newflags); + error = ioctl(fd, EXT3_IOC_GETFLAGS, newflags); if (error) die(can't get flags on %s: %s\n, argv[optind], strerror(errno)); newflags = set ? newflags | flag : newflags ~flag; /* new flags */ - error = ioctl(fd, FS_IOC_SETFLAGS, newflags); + error = ioctl(fd, EXT3_IOC_SETFLAGS, newflags); if (error) die(can't set flags on %s: %s\n, argv[optind], strerror(errno)); hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-41-g9b83c17
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=9b83c1750434f1065c63fe547303260da15a73b2 The branch, RHEL5 has been updated via 9b83c1750434f1065c63fe547303260da15a73b2 (commit) from b0d53e957419d279f5b1846d29160d150f1d02d2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 9b83c1750434f1065c63fe547303260da15a73b2 Author: Abhijith Das [EMAIL PROTECTED] Date: Fri Apr 11 09:40:41 2008 -0500 gfs2_tool manpage: Updates to the manpage for bz441636 --- Summary of changes: gfs2/man/gfs2_tool.8 | 10 +++--- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gfs2/man/gfs2_tool.8 b/gfs2/man/gfs2_tool.8 index 36b90b7..503cddb 100644 --- a/gfs2/man/gfs2_tool.8 +++ b/gfs2/man/gfs2_tool.8 @@ -97,10 +97,9 @@ client when you do this. No one should have to use this. Print out the superblock. .TP \fBsetflag\fP \fIFlag\fR \fIFile1\fR \fIFile2\fR \fI...\fR -Set an attribute flag on a file. There are six currently -supported flags. They are jdata, directio, immutable, appendonly, -noatime, and sync. In most cases, the chattr command may be used -rather than gfs2_tool to set attributes. +Set an attribute flag on a file. The currently supported flags are +jdata, immutable, appendonly, noatime, and sync. In most cases, the +chattr command may be used rather than gfs2_tool to set attributes. The \fIjdata\fR flag causes all the data written to a file to be journaled. If the \fIjdata\fR flag is set for a directory, @@ -108,9 +107,6 @@ all files and directories subsequently created within that directory are also journaled. This behavior replaces the old \fIinherit_jdata\fR flag from gfs. Same as chattr +j. -The \fIdirectio\fR flag causes all I/O to a regular file to be Direct -I/O, even if the O_DIRECT flag isn't used on the open() command. - The \fIimmutable\fR flag marks the file immutable. The behavior is similar to the immutable flag in the ext2/3 filesystems. All write access is denied. Same as chattr +i. hooks/post-receive -- Cluster Project
[Cluster-devel] Cluster Project annotated tag, cluster-2.03.00, created. cluster-2.03.00
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=e07faed464b8d808f1594c00854039a8d8b1baaa The annotated tag, cluster-2.03.00 has been created at e07faed464b8d808f1594c00854039a8d8b1baaa (tag) tagging 819fddbffaf73550a046f79e78d5147f0e8b9030 (commit) replaces cluster-2.02.00 tagged by David Teigland on Fri Apr 11 09:45:31 2008 -0500 - Log - cluster-2.03.00 release Abhijith Das (3): gfs2_tool: remove 'gfs2_tool counters' as they aren't implemented anymore gfs-kernel: fix for bz 429343 gfs_glock_is_locked_by_me assertion gfs2_tool manpage: gfs2_tool counters doesn't exist anymore. Andrew Price (1): [[BUILD] Warn and continue if CONFIG_KERNELVERSION is not found Bob Peterson (9): Resolves: bz 435917: GFS2: mkfs.gfs2 default lock protocol Resolves: bz 421761: 'gfs_tool lockdump' wrongly says 'unknown Resolves: bz 431945: GFS: gfs-kernel should use device major:minor Update to prior commit for bz431945: I forgot that STABLE2 Resolves: bz 436383: GFS filesystem size inconsistent Fix savemeta so it saves gfs-1 rg information properly Fix gfs2_edit print options (-p) to work properly for gfs-1 gfs2_edit was not recalculating the max block size after it figured Fix some compiler warnings in gfs2_edit Chris Feist (1): Added back in change to description line to make chkconfig work properly. Christine Caulfield (5): [DLM] Don't segfault if lvbptr is NULL [CMAN] Free up any queued messages when someone disconnects [CMAN] Limit outstanding replies [CMAN] valid port number don't use it before validation Remove references to broadcast. David Teigland (4): doc: update usage.txt groupd: purge messages from dead nodes dlm_tool: print correct rq mode in lockdump libdlm: fix lvb copying Fabio M. Di Nitto (8): [BUILD] Fix configure script to handle releases [BUILD] Fix build system with openais whitetank [BUILD] Allow release version to contain padding 0's Add toplevel .gitignore [BUILD] Fix handling of version and libraries soname [BUILD] Fix man page install permission Revert Fix help message to refer to script as 'fence_scsi_test'. Revert fix bz277781 by accepting nodename as a synonym for node Joel Becker (1): libdlm: Don't pass LKF_WAIT to the kernel Jonathan Brassow (4): rgmanager/lvm.sh: Fix bug 438816 rgmanager/lvm.sh: Fix bug bz242798 rgmanager/lvm.sh: change argument order of shell command rgmanager/lvm.sh: Minor comment updates Lon Hohberger (10): Add Sybase failover agent Update changelog Add / fix Oracle 10g failover agent [rgmanager] Make ip.sh check link states of non-ethernet devices [rgmanager] Set cloexec bit in msg_socket.c [rgmanager] Don't call quotaoff if quotas are not used [CMAN] Fix Node X is undead loop bug [rgmanager] Fix #432998 [cman] Apply missing fix for #315711 [CMAN] Make cman init script start qdiskd intelligently Ryan McCabe (1): fix bz277781 by accepting nodename as a synonym for node Ryan O'Hara (15): Variable should be quoted in conditional statement. Fix unregister code to report failure correctly. Remove self parameter. This was used to specify the name of the node Fix code to use get_key subroutine. Fix split calls to be consistent. Remove the optional LIMIT parameter. Replace /var/lock/subsys/${0##*/} with /var/lock/subsys/scsi_reserve. Fix success/failure reporting when registering devices at startup. Rewrite of get_scsi_devices function. Record devices that are successfully registered to /var/run/scsi_reserve. Allow 'stop' to release the reservation if and only if there are no other Attempt to register the node in the case where it must perform fence_scsi Fix help message to refer to script as 'fence_scsi_test'. BZ 248715 BZ: 373491, 373511, 373531, 373541, 373571, 429033 BZ 441323 : Redirect stderr to /dev/null when getting list of devices. --- hooks/post-receive -- Cluster Project
[Cluster-devel] cluster-2.03.00
A new source tarball of cluster code has been released: cluster-2.03.00 This has been taken from the STABLE2 branch in the cluster git tree. It is compatible with the current stable release of openais (0.80.3), and the current stable release of the kernel (2.6.24). ftp://sources.redhat.com/pub/cluster/releases/cluster-2.03.00.tar.gz To use gfs, a kernel patch is required to export three symbols from gfs2: ftp://sources.redhat.com/pub/cluster/releases/lockproto-exports.patch Abhijith Das (3): gfs2_tool: remove 'gfs2_tool counters' as they aren't implemented anymore gfs-kernel: fix for bz 429343 gfs_glock_is_locked_by_me assertion gfs2_tool manpage: gfs2_tool counters doesn't exist anymore. Andrew Price (1): [[BUILD] Warn and continue if CONFIG_KERNELVERSION is not found Bob Peterson (9): Resolves: bz 435917: GFS2: mkfs.gfs2 default lock protocol Resolves: bz 421761: 'gfs_tool lockdump' wrongly says 'unknown Resolves: bz 431945: GFS: gfs-kernel should use device major:minor Update to prior commit for bz431945: I forgot that STABLE2 Resolves: bz 436383: GFS filesystem size inconsistent Fix savemeta so it saves gfs-1 rg information properly Fix gfs2_edit print options (-p) to work properly for gfs-1 gfs2_edit was not recalculating the max block size after it figured Fix some compiler warnings in gfs2_edit Chris Feist (1): Added back in change to description line to make chkconfig work properly. Christine Caulfield (5): [DLM] Don't segfault if lvbptr is NULL [CMAN] Free up any queued messages when someone disconnects [CMAN] Limit outstanding replies [CMAN] valid port number don't use it before validation Remove references to broadcast. David Teigland (4): doc: update usage.txt groupd: purge messages from dead nodes dlm_tool: print correct rq mode in lockdump libdlm: fix lvb copying Fabio M. Di Nitto (8): [BUILD] Fix configure script to handle releases [BUILD] Fix build system with openais whitetank [BUILD] Allow release version to contain padding 0's Add toplevel .gitignore [BUILD] Fix handling of version and libraries soname [BUILD] Fix man page install permission Revert Fix help message to refer to script as 'fence_scsi_test'. Revert fix bz277781 by accepting nodename as a synonym for node Joel Becker (1): libdlm: Don't pass LKF_WAIT to the kernel Jonathan Brassow (4): rgmanager/lvm.sh: Fix bug 438816 rgmanager/lvm.sh: Fix bug bz242798 rgmanager/lvm.sh: change argument order of shell command rgmanager/lvm.sh: Minor comment updates Lon Hohberger (10): Add Sybase failover agent Update changelog Add / fix Oracle 10g failover agent [rgmanager] Make ip.sh check link states of non-ethernet devices [rgmanager] Set cloexec bit in msg_socket.c [rgmanager] Don't call quotaoff if quotas are not used [CMAN] Fix Node X is undead loop bug [rgmanager] Fix #432998 [cman] Apply missing fix for #315711 [CMAN] Make cman init script start qdiskd intelligently Ryan McCabe (1): fix bz277781 by accepting nodename as a synonym for node Ryan O'Hara (15): Variable should be quoted in conditional statement. Fix unregister code to report failure correctly. Remove self parameter. This was used to specify the name of the node Fix code to use get_key subroutine. Fix split calls to be consistent. Remove the optional LIMIT parameter. Replace /var/lock/subsys/${0##*/} with /var/lock/subsys/scsi_reserve. Fix success/failure reporting when registering devices at startup. Rewrite of get_scsi_devices function. Record devices that are successfully registered to /var/run/scsi_reserve. Allow 'stop' to release the reservation if and only if there are no other Attempt to register the node in the case where it must perform fence_scsi Fix help message to refer to script as 'fence_scsi_test'. BZ 248715 BZ: 373491, 373511, 373531, 373541, 373571, 429033 BZ 441323 : Redirect stderr to /dev/null when getting list of devices. .gitignore|1 + cman/daemon/Makefile |3 +- cman/daemon/cmanccs.c | 11 +- cman/daemon/cnxman-private.h |2 +- cman/daemon/commands.c|2 +- cman/daemon/daemon.c | 40 ++- cman/daemon/daemon.h |3 +- cman/init.d/cman.in | 32 ++ cman/init.d/qdiskd| 21 +- cman/lib/Makefile | 14 +- cman/man/cman_tool.8 | 20 +- cman/qdisk/main.c | 34 +- configure | 87 +++- dlm/lib/Makefile | 26 +- dlm/lib/libdlm.c | 15 +- dlm/tool/main.c
[Cluster-devel] Cluster Project branch, STABLE2, updated. cluster-2.02.00-64-g22663a8
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project Cluster Project. http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=22663a865681ebcc2f3c921a3ef3967d66d5663f The branch, STABLE2 has been updated via 22663a865681ebcc2f3c921a3ef3967d66d5663f (commit) from e3922593271e97d91e69944a9675d2216e62a186 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 22663a865681ebcc2f3c921a3ef3967d66d5663f Author: Abhijith Das [EMAIL PROTECTED] Date: Fri Apr 11 09:40:41 2008 -0500 gfs2_tool manpage: Updates to the manpage for bz441636 --- Summary of changes: gfs2/man/gfs2_tool.8 | 10 +++--- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gfs2/man/gfs2_tool.8 b/gfs2/man/gfs2_tool.8 index 36b90b7..503cddb 100644 --- a/gfs2/man/gfs2_tool.8 +++ b/gfs2/man/gfs2_tool.8 @@ -97,10 +97,9 @@ client when you do this. No one should have to use this. Print out the superblock. .TP \fBsetflag\fP \fIFlag\fR \fIFile1\fR \fIFile2\fR \fI...\fR -Set an attribute flag on a file. There are six currently -supported flags. They are jdata, directio, immutable, appendonly, -noatime, and sync. In most cases, the chattr command may be used -rather than gfs2_tool to set attributes. +Set an attribute flag on a file. The currently supported flags are +jdata, immutable, appendonly, noatime, and sync. In most cases, the +chattr command may be used rather than gfs2_tool to set attributes. The \fIjdata\fR flag causes all the data written to a file to be journaled. If the \fIjdata\fR flag is set for a directory, @@ -108,9 +107,6 @@ all files and directories subsequently created within that directory are also journaled. This behavior replaces the old \fIinherit_jdata\fR flag from gfs. Same as chattr +j. -The \fIdirectio\fR flag causes all I/O to a regular file to be Direct -I/O, even if the O_DIRECT flag isn't used on the open() command. - The \fIimmutable\fR flag marks the file immutable. The behavior is similar to the immutable flag in the ext2/3 filesystems. All write access is denied. Same as chattr +i. hooks/post-receive -- Cluster Project
[Cluster-devel] conga/luci/cluster fence-macros
CVSROOT:/cvs/cluster Module name:conga Branch: RHEL4 Changes by: [EMAIL PROTECTED] 2008-04-11 22:43:17 Modified files: luci/cluster : fence-macros Log message: Fix typo Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/fence-macros.diff?cvsroot=clusteronly_with_tag=RHEL4r1=1.2.4.2r2=1.2.4.3 --- conga/luci/cluster/fence-macros 2008/04/11 06:48:10 1.2.4.2 +++ conga/luci/cluster/fence-macros 2008/04/11 22:43:17 1.2.4.3 @@ -1850,7 +1850,7 @@ tdNode name/td td input type=text name=node - tal:attributes=value request/node | nothing / + tal:attributes=value cur_instance/node | nothing / /td /tr /table