cluster: STABLE3 - cman init: add check for executable
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: f28ffc584d21fdf0c72e97ccc13a16c85e253655
Parent: 2d63f693d780f9b3ac667c3445346f5798c42537
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Mon Jan 11 16:49:25 2010 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Mon Jan 11 16:49:25 2010 +0100
cman init: add check for executable
based on debian idea to check if a binary is available and executable,
implement a generic check and use it around.
we do only check for our own binaries. System binaries are supposed to be
there and in a sane state (otherwise the init script would fail anyway).
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/init.d/cman.in | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 9caff61..1cf3366 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -19,8 +19,6 @@
# set secure PATH
PATH="/bin:/usr/bin:/sbin:/usr/sbin:@SBINDIR@"
-[ -x @SBINDIR@/cman_tool ] || exit 0
-
local_chkconfig()
{
case "$1" in
@@ -222,12 +220,29 @@ runwrap()
fi
}
+check_exec()
+{
+ exec=$1
+
+ realexec="$(type -p $exec)"
+ if [ -z "$realexec" ]; then
+ errmsg="Unable to find $exec in PATH"
+ return 1
+ fi
+ if [ ! -x "$realexec" ]; then
+ errmsg="$realexec not executable"
+ return 1
+ fi
+ return 0
+}
+
start_daemon()
{
daemon=$1
shift
args="$@"
+ check_exec $daemon || return $?
status $daemon > /dev/null 2>&1 && return 0
errmsg=$( $daemon $args 2>&1 )
}
@@ -505,6 +520,7 @@ stop_configfs()
start_cman()
{
+ check_exec cman_tool || return $?
cman_running && return 0
cman_checkconfig || return 1
14 years, 4 months
cluster: STABLE3 - cman init: drop use of test in favour of shell bits
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 2d63f693d780f9b3ac667c3445346f5798c42537
Parent: c8dba498c41ebb5c88ad4ee955febaad69007198
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Mon Jan 11 15:50:05 2010 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Mon Jan 11 15:50:05 2010 +0100
cman init: drop use of test in favour of shell bits
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/init.d/cman.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 3572381..9caff61 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -342,7 +342,7 @@ cman_checkconfig()
xend_bridged_net_enabled() {
# Not a xen kernel
- test -d /proc/xen || return 1
+ [ -d /proc/xen ] || return 1
# uanble to determine current runlevel
current_runlevel=$( runlevel 2>/dev/null | \
14 years, 4 months
cluster: STABLE3 - cman init: check for cman_tool before executing the script
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: c8dba498c41ebb5c88ad4ee955febaad69007198
Parent: 75d28b69c5e47f48149efba985609161782bd31c
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Mon Jan 11 15:48:35 2010 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Mon Jan 11 15:48:35 2010 +0100
cman init: check for cman_tool before executing the script
Original patch from Guido Gunther.
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/init.d/cman.in | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index bb917e6..3572381 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -19,6 +19,8 @@
# set secure PATH
PATH="/bin:/usr/bin:/sbin:/usr/sbin:@SBINDIR@"
+[ -x @SBINDIR@/cman_tool ] || exit 0
+
local_chkconfig()
{
case "$1" in
14 years, 4 months
cluster: RHEL55 - gfs_fsck: Don't try to convert free_meta to free if -n was specified.
by Bob Peterson
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: dd3b502a1900ae94d5eb569cd7f2ad06436bb15e
Parent: cecd340f67bda6d65465b13a018dd1a1fe5692a5
Author: Bob Peterson <rpeterso(a)redhat.com>
AuthorDate: Fri Jan 8 13:20:24 2010 -0600
Committer: Bob Peterson <rpeterso(a)redhat.com>
CommitterDate: Fri Jan 8 13:20:24 2010 -0600
gfs_fsck: Don't try to convert free_meta to free if -n was specified.
The code was checking free_meta blocks and free inodes and counting
them as errors even if -n was specified on gfs_fsck. But free_meta
blocks aren't technically an error and gfs_fsck's converting them to
free blocks is a convenience, so if -n was specified, don't treat
them as errors.
rhbz#508978
---
gfs/gfs_fsck/pass4.c | 70 +++++++++++++++++++++++++++----------------------
gfs/gfs_fsck/pass5.c | 10 +++++--
2 files changed, 46 insertions(+), 34 deletions(-)
diff --git a/gfs/gfs_fsck/pass4.c b/gfs/gfs_fsck/pass4.c
index be900ec..1adb355 100644
--- a/gfs/gfs_fsck/pass4.c
+++ b/gfs/gfs_fsck/pass4.c
@@ -131,40 +131,48 @@ static int scan_inode_list(struct fsck_sb *sbp, osi_list_t *list) {
stack;
return -1;
}
- /* We don't want to clear zero-size files with
- * eattrs - there might be relevent info in
- * them. */
- if(!ip->i_di.di_size && !ip->i_di.di_eattr){
- log_err("Unlinked inode has zero size\n");
+ if(!sbp->opts->no) {
+ /* We don't want to clear zero-size files with
+ * eattrs - there might be relevent info in
+ * them. */
+ if(!ip->i_di.di_size && !ip->i_di.di_eattr){
+ log_err("Unlinked inode has zero "
+ "size\n");
+ errors_found++;
+ if(query(sbp, "Clear zero-size "
+ "unlinked inode? (y/n) ")) {
+ errors_corrected++;
+ block_set(sbp->bl, ii->inode,
+ block_free);
+ free_inode(&ip);
+ log_err("Unlinked inode with "
+ "zero size cleared\n");
+ continue;
+ } else
+ log_err("Unlinked inode with "
+ "zero size not "
+ "cleared\n");
+ }
errors_found++;
- if(query(sbp, "Clear zero-size unlinked inode? (y/n) ")) {
- errors_corrected++;
- block_set(sbp->bl, ii->inode, block_free);
- free_inode(&ip);
- log_err("Unlinked inode with zero size cleared\n");
- continue;
+ if(query(sbp, "Add unlinked inode to l+f? "
+ "(y/n)")) {
+ if(add_inode_to_lf(ip)) {
+ stack;
+ free_inode(&ip);
+ log_err("Unable to unlinked "
+ "inode to l+f\n");
+ return -1;
+ } else {
+ fix_inode_count(sbp, ii, ip);
+ lf_addition = 1;
+ errors_corrected++;
+ log_err("Unlinked inode added "
+ "to l+f\n");
+ }
} else
- log_err("Unlinked inode with zero size"
- " not cleared\n");
-
+ log_err("Unlinked inode left "
+ "unlinked\n");
}
- errors_found++;
- if(query(sbp, "Add unlinked inode to l+f? (y/n)")) {
- if(add_inode_to_lf(ip)) {
- stack;
- free_inode(&ip);
- log_err("Unable to unlinked inode to "
- "l+f\n");
- return -1;
- } else {
- fix_inode_count(sbp, ii, ip);
- lf_addition = 1;
- errors_corrected++;
- log_err("Unlinked inode added to "
- "l+f\n");
- }
- } else
- log_err("Unlinked inode left unlinked\n");
free_inode(&ip);
}
else if(ii->link_count != ii->counted_links) {
diff --git a/gfs/gfs_fsck/pass5.c b/gfs/gfs_fsck/pass5.c
index 1d4db05..1b01d84 100644
--- a/gfs/gfs_fsck/pass5.c
+++ b/gfs/gfs_fsck/pass5.c
@@ -215,10 +215,11 @@ static int check_block_status(struct fsck_sb *sbp, char *buffer, unsigned int bu
rg_status, block_status, q.block_type);
if((rg_status == GFS_BLKST_FREEMETA) &&
(block_status == GFS_BLKST_FREE)) {
- errors_found++;
- log_info("Converting free metadata block at %"
- PRIu64" to a free data block\n", block);
if(!sbp->opts->no) {
+ errors_found++;
+ log_info("Converting free metadata "
+ "block at %"PRIu64" to a "
+ "free data block\n", block);
if(fs_set_bitmap(sbp, block, block_status)) {
log_warn("Failed to convert "
"free metadata block "
@@ -231,6 +232,9 @@ static int check_block_status(struct fsck_sb *sbp, char *buffer, unsigned int bu
errors_corrected++;
}
}
+ /* If we have free_meta blocks but -n was
+ specified, we can't convert them. But it's
+ also not technically an error. */
}
else {
const char *blockstatus[] = {"Free", "Data",
14 years, 4 months
gfs1-utils: master - gfs_fsck: Don't try to convert free inodes to free if -n was specified.
by Bob Peterson
Gitweb: http://git.fedorahosted.org/git/gfs1-utils.git?p=gfs1-utils.git;a=commitd...
Commit: 8345fb9996e424019439f03690b836e9a91def5a
Parent: 60c67a969639d95e842c2e90a567f2c94689db70
Author: Bob Peterson <rpeterso(a)redhat.com>
AuthorDate: Fri Jan 8 13:00:30 2010 -0600
Committer: Bob Peterson <rpeterso(a)redhat.com>
CommitterDate: Fri Jan 8 13:00:30 2010 -0600
gfs_fsck: Don't try to convert free inodes to free if -n was specified.
The code was checking free inodes and attempting to convert them
to free blocks, even if -n was specified on gfs_fsck. But free inodes
aren't technically errors and gfs_fsck's converting them to free blocks
is a convenience, so if -n was specified, don't treat them as errors.
rhbz#508978
---
gfs/gfs_fsck/pass4.c | 70 +++++++++++++++++++++++++++----------------------
1 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/gfs/gfs_fsck/pass4.c b/gfs/gfs_fsck/pass4.c
index edfd57d..cb4255e 100644
--- a/gfs/gfs_fsck/pass4.c
+++ b/gfs/gfs_fsck/pass4.c
@@ -118,40 +118,48 @@ static int scan_inode_list(struct fsck_sb *sbp, osi_list_t *list) {
stack;
return -1;
}
- /* We don't want to clear zero-size files with
- * eattrs - there might be relevent info in
- * them. */
- if(!ip->i_di.di_size && !ip->i_di.di_eattr){
- log_err("Unlinked inode has zero size\n");
+ if(!sbp->opts->no) {
+ /* We don't want to clear zero-size files with
+ * eattrs - there might be relevent info in
+ * them. */
+ if(!ip->i_di.di_size && !ip->i_di.di_eattr){
+ log_err("Unlinked inode has zero "
+ "size\n");
+ errors_found++;
+ if(query(sbp, "Clear zero-size "
+ "unlinked inode? (y/n) ")) {
+ errors_corrected++;
+ block_set(sbp->bl, ii->inode,
+ block_free);
+ free_inode(&ip);
+ log_err("Unlinked inode with "
+ "zero size cleared\n");
+ continue;
+ } else
+ log_err("Unlinked inode with "
+ "zero size not "
+ "cleared\n");
+ }
errors_found++;
- if(query(sbp, "Clear zero-size unlinked inode? (y/n) ")) {
- errors_corrected++;
- block_set(sbp->bl, ii->inode, block_free);
- free_inode(&ip);
- log_err("Unlinked inode with zero size cleared\n");
- continue;
+ if(query(sbp, "Add unlinked inode to l+f? "
+ "(y/n)")) {
+ if(add_inode_to_lf(ip)) {
+ stack;
+ free_inode(&ip);
+ log_err("Unable to unlinked "
+ "inode to l+f\n");
+ return -1;
+ } else {
+ fix_inode_count(sbp, ii, ip);
+ lf_addition = 1;
+ errors_corrected++;
+ log_err("Unlinked inode added "
+ "to l+f\n");
+ }
} else
- log_err("Unlinked inode with zero size"
- " not cleared\n");
-
+ log_err("Unlinked inode left "
+ "unlinked\n");
}
- errors_found++;
- if(query(sbp, "Add unlinked inode to l+f? (y/n)")) {
- if(add_inode_to_lf(ip)) {
- stack;
- free_inode(&ip);
- log_err("Unable to unlinked inode to "
- "l+f\n");
- return -1;
- } else {
- fix_inode_count(sbp, ii, ip);
- lf_addition = 1;
- errors_corrected++;
- log_err("Unlinked inode added to "
- "l+f\n");
- }
- } else
- log_err("Unlinked inode left unlinked\n");
free_inode(&ip);
}
else if(ii->link_count != ii->counted_links) {
14 years, 4 months
gfs1-utils: master - gfs_fsck: Don't try to convert free_meta to free if -n was specified.
by Bob Peterson
Gitweb: http://git.fedorahosted.org/git/gfs1-utils.git?p=gfs1-utils.git;a=commitd...
Commit: 60c67a969639d95e842c2e90a567f2c94689db70
Parent: 3f34656a829f464033c79d50e607e2936dd46030
Author: Bob Peterson <rpeterso(a)redhat.com>
AuthorDate: Fri Jan 8 12:59:04 2010 -0600
Committer: Bob Peterson <rpeterso(a)redhat.com>
CommitterDate: Fri Jan 8 12:59:04 2010 -0600
gfs_fsck: Don't try to convert free_meta to free if -n was specified.
The code was checking free_meta blocks and counting them as errors
even if -n was specified on gfs_fsck. But free_meta blocks aren't
technically an error and gfs_fsck's converting them to free blocks
is a convenience, so if -n was specified, don't treat them as errors.
rhbz#508978
---
gfs/gfs_fsck/pass5.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/gfs/gfs_fsck/pass5.c b/gfs/gfs_fsck/pass5.c
index d8d0768..9916664 100644
--- a/gfs/gfs_fsck/pass5.c
+++ b/gfs/gfs_fsck/pass5.c
@@ -202,10 +202,11 @@ static int check_block_status(struct fsck_sb *sbp, char *buffer, unsigned int bu
rg_status, block_status, q.block_type);
if((rg_status == GFS_BLKST_FREEMETA) &&
(block_status == GFS_BLKST_FREE)) {
- errors_found++;
- log_info("Converting free metadata block at %"
- PRIu64" to a free data block\n", block);
if(!sbp->opts->no) {
+ errors_found++;
+ log_info("Converting free metadata "
+ "block at %" PRIu64 " to a "
+ "free data block\n", block);
if(fs_set_bitmap(sbp, block, block_status)) {
log_warn("Failed to convert free metadata block to free data block at %PRIu64.\n", block);
}
@@ -214,6 +215,9 @@ static int check_block_status(struct fsck_sb *sbp, char *buffer, unsigned int bu
errors_corrected++;
}
}
+ /* If we have free_meta blocks but -n was
+ specified, we can't convert them. But it's
+ also not technically an error. */
}
else {
const char *blockstatus[] = {"Free", "Data",
14 years, 4 months
cluster: STABLE3 - gfs_fsck: Don't try to convert free inodes to free if -n was specified.
by Bob Peterson
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 75d28b69c5e47f48149efba985609161782bd31c
Parent: cf9c5e17f768c02b639d57df606b7b1594eb00ab
Author: Bob Peterson <rpeterso(a)redhat.com>
AuthorDate: Fri Jan 8 12:44:14 2010 -0600
Committer: Bob Peterson <rpeterso(a)redhat.com>
CommitterDate: Fri Jan 8 12:44:14 2010 -0600
gfs_fsck: Don't try to convert free inodes to free if -n was specified.
The code was checking free inodes and attempting to convert them
to free blocks, even if -n was specified on gfs_fsck. But free inodes
aren't technically errors and gfs_fsck's converting them to free blocks
is a convenience, so if -n was specified, don't treat them as errors.
rhbz#508978
---
gfs/gfs_fsck/pass4.c | 70 +++++++++++++++++++++++++++----------------------
1 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/gfs/gfs_fsck/pass4.c b/gfs/gfs_fsck/pass4.c
index edfd57d..cb4255e 100644
--- a/gfs/gfs_fsck/pass4.c
+++ b/gfs/gfs_fsck/pass4.c
@@ -118,40 +118,48 @@ static int scan_inode_list(struct fsck_sb *sbp, osi_list_t *list) {
stack;
return -1;
}
- /* We don't want to clear zero-size files with
- * eattrs - there might be relevent info in
- * them. */
- if(!ip->i_di.di_size && !ip->i_di.di_eattr){
- log_err("Unlinked inode has zero size\n");
+ if(!sbp->opts->no) {
+ /* We don't want to clear zero-size files with
+ * eattrs - there might be relevent info in
+ * them. */
+ if(!ip->i_di.di_size && !ip->i_di.di_eattr){
+ log_err("Unlinked inode has zero "
+ "size\n");
+ errors_found++;
+ if(query(sbp, "Clear zero-size "
+ "unlinked inode? (y/n) ")) {
+ errors_corrected++;
+ block_set(sbp->bl, ii->inode,
+ block_free);
+ free_inode(&ip);
+ log_err("Unlinked inode with "
+ "zero size cleared\n");
+ continue;
+ } else
+ log_err("Unlinked inode with "
+ "zero size not "
+ "cleared\n");
+ }
errors_found++;
- if(query(sbp, "Clear zero-size unlinked inode? (y/n) ")) {
- errors_corrected++;
- block_set(sbp->bl, ii->inode, block_free);
- free_inode(&ip);
- log_err("Unlinked inode with zero size cleared\n");
- continue;
+ if(query(sbp, "Add unlinked inode to l+f? "
+ "(y/n)")) {
+ if(add_inode_to_lf(ip)) {
+ stack;
+ free_inode(&ip);
+ log_err("Unable to unlinked "
+ "inode to l+f\n");
+ return -1;
+ } else {
+ fix_inode_count(sbp, ii, ip);
+ lf_addition = 1;
+ errors_corrected++;
+ log_err("Unlinked inode added "
+ "to l+f\n");
+ }
} else
- log_err("Unlinked inode with zero size"
- " not cleared\n");
-
+ log_err("Unlinked inode left "
+ "unlinked\n");
}
- errors_found++;
- if(query(sbp, "Add unlinked inode to l+f? (y/n)")) {
- if(add_inode_to_lf(ip)) {
- stack;
- free_inode(&ip);
- log_err("Unable to unlinked inode to "
- "l+f\n");
- return -1;
- } else {
- fix_inode_count(sbp, ii, ip);
- lf_addition = 1;
- errors_corrected++;
- log_err("Unlinked inode added to "
- "l+f\n");
- }
- } else
- log_err("Unlinked inode left unlinked\n");
free_inode(&ip);
}
else if(ii->link_count != ii->counted_links) {
14 years, 4 months
cluster: STABLE3 - gfs_fsck: Don't try to convert free_meta to free if -n was specified.
by Bob Peterson
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: cf9c5e17f768c02b639d57df606b7b1594eb00ab
Parent: 89bbcb2cac174e404f3b5bbf0fce4f9da7ff59f7
Author: Bob Peterson <rpeterso(a)redhat.com>
AuthorDate: Fri Jan 8 10:17:53 2010 -0600
Committer: Bob Peterson <rpeterso(a)redhat.com>
CommitterDate: Fri Jan 8 10:17:53 2010 -0600
gfs_fsck: Don't try to convert free_meta to free if -n was specified.
The code was checking free_meta blocks and counting them as errors
even if -n was specified on gfs_fsck. But free_meta blocks aren't
technically an error and gfs_fsck's converting them to free blocks
is a convenience, so if -n was specified, don't treat them as errors.
rhbz#508978
---
gfs/gfs_fsck/pass5.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/gfs/gfs_fsck/pass5.c b/gfs/gfs_fsck/pass5.c
index d8d0768..9916664 100644
--- a/gfs/gfs_fsck/pass5.c
+++ b/gfs/gfs_fsck/pass5.c
@@ -202,10 +202,11 @@ static int check_block_status(struct fsck_sb *sbp, char *buffer, unsigned int bu
rg_status, block_status, q.block_type);
if((rg_status == GFS_BLKST_FREEMETA) &&
(block_status == GFS_BLKST_FREE)) {
- errors_found++;
- log_info("Converting free metadata block at %"
- PRIu64" to a free data block\n", block);
if(!sbp->opts->no) {
+ errors_found++;
+ log_info("Converting free metadata "
+ "block at %" PRIu64 " to a "
+ "free data block\n", block);
if(fs_set_bitmap(sbp, block, block_status)) {
log_warn("Failed to convert free metadata block to free data block at %PRIu64.\n", block);
}
@@ -214,6 +215,9 @@ static int check_block_status(struct fsck_sb *sbp, char *buffer, unsigned int bu
errors_corrected++;
}
}
+ /* If we have free_meta blocks but -n was
+ specified, we can't convert them. But it's
+ also not technically an error. */
}
else {
const char *blockstatus[] = {"Free", "Data",
14 years, 4 months
cluster: STABLE3 - build: fix fence man page stuff
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 89bbcb2cac174e404f3b5bbf0fce4f9da7ff59f7
Parent: 33dd41fa03a5a79a585630cfeae57489729faa6c
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Fri Jan 8 10:31:40 2010 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Fri Jan 8 10:31:40 2010 +0100
build: fix fence man page stuff
fence.8 has passed away..
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
fence/man/Makefile | 2 +-
make/release.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fence/man/Makefile b/fence/man/Makefile
index 0b54770..45401f6 100644
--- a/fence/man/Makefile
+++ b/fence/man/Makefile
@@ -1,6 +1,6 @@
include ../../make/defines.mk
-MANTARGET = fence.8 fenced.8 fence_node.8 fence_tool.8
+MANTARGET = fenced.8 fence_node.8 fence_tool.8
ifdef fence_agents
MANTARGET += \
diff --git a/make/release.mk b/make/release.mk
index 421bcbc..be29aaf 100644
--- a/make/release.mk
+++ b/make/release.mk
@@ -92,7 +92,7 @@ fence-agents-tarball: master-tarball
rm -rf bindings cman common config contrib dlm gfs* group \
rgmanager fence/fenced fence/fence_node \
fence/fence_tool fence/include fence/libfence \
- fence/libfenced fence/man/fence.8 fence/man/fenced.8 \
+ fence/libfenced fence/man/fenced.8 \
fence/man/fence_node.8 fence/man/fence_tool.8 && \
sed -i -e 's/fence.8//g' -e 's/fenced.8//g' \
-e 's/fence_node.8//g' -e 's/fence_tool.8//g' \
14 years, 4 months
cluster: STABLE3 - build: fix Makefile filters for gfs
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 33dd41fa03a5a79a585630cfeae57489729faa6c
Parent: 585af66d237cb3408c469351a3f69c78a6c4ad1c
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Fri Jan 8 10:23:38 2010 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Fri Jan 8 10:23:38 2010 +0100
build: fix Makefile filters for gfs
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
Makefile | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 223c75d..3e3cab9 100644
--- a/Makefile
+++ b/Makefile
@@ -16,19 +16,14 @@ SUBDIRS = $(filter-out \
$(if ${without_gfs2},gfs2) \
$(if ${without_rgmanager},rgmanager) \
$(if ${without_bindings},bindings) \
+ $(if ${enable_gfs},,gfs) \
+ $(if ${enable_gfs-kernel/src/gfs},,gfs-kernel/src/gfs) \
, $(REALSUBDIRS))
-ifdef enable_gfs
-SUBDIRS += gfs
-endif
-ifdef enable_gfs-kernel/src/gfs
-SUBDIRS += gfs-kernel/src/gfs
-endif
-
all: ${SUBDIRS}
${SUBDIRS}:
- [ -n "${without_$@}" ] || ${MAKE} -C $@ all
+ ${MAKE} -C $@ all
# Kernel
14 years, 4 months