Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=1a3f07b2…
Commit: 1a3f07b257b69f4d19006bf72f713a7266cb0767
Parent: 0000000000000000000000000000000000000000
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: 2012-11-05 10:47 +0000
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: 2012-11-05 10:47 +0000
annotated tag: v3.1.11 has been created
at 1a3f07b257b69f4d19006bf72f713a7266cb0767 (tag)
tagging 4727d7e280c53ea2c3fca502c945b70418a5a7d1 (commit)
replaces v3.1.10
v3.1.11 release
Marek 'marx' Grac (8):
fence_rhevm: Support new API used in RHEV-M 3.1
fence_rhevm: fix typo in RE
fence_na: Add support for XML metadata output
fence-agents: Extend set of default device options
fence_cisco_ucs: Incorrect timeout was used during login
fence-agents: Use default values for device options instead of per-agent solutions
fabric fence agents: Fix dealing with enable/disable and support on/off options for fabric fence agents
fence_ipmilan: Fix manual page for HP iLO3, HP iLO4
Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=4727d7e2…
Commit: 4727d7e280c53ea2c3fca502c945b70418a5a7d1
Parent: c7ba00daf03a19d7557e825e637a220b5cc4deae
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Mon Nov 5 11:39:15 2012 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Mon Nov 5 11:39:15 2012 +0100
fence_ipmilan: Fix manual page for HP iLO3, HP iLO4
---
fence/agents/ipmilan/ipmilan.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fence/agents/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c
index d1a0530..1eb733e 100644
--- a/fence/agents/ipmilan/ipmilan.c
+++ b/fence/agents/ipmilan/ipmilan.c
@@ -903,14 +903,14 @@ static void print_xml_metadata(char *pname) {
printf("%s\n","<?xml version=\"1.0\" ?>");
printf("%s%s%s\n","<resource-agent name=\"",pname,"\" shortdesc=\"Fence agent for IPMI over LAN\">");
- printf("<symlink name=\"fence_ilo3\" shortdesc=\"Fence agent for HP iLO2\"/>\n");
+ printf("<symlink name=\"fence_ilo3\" shortdesc=\"Fence agent for HP iLO3\"/>\n");
printf("<symlink name=\"fence_idrac\" shortdesc=\"Fence agent for Dell iDRAC\"/>\n");
printf("<symlink name=\"fence_imm\" shortdesc=\"Fence agent for IBM Integrated Management Module\"/>\n");
printf("<longdesc>\n");
printf("fence_ipmilan is an I/O Fencing agent which can be used with "
"machines controlled by IPMI. This agent calls support software "
"using ipmitool (http://ipmitool.sf.net/).\n\n"
- "To use fence_ipmilan with HP iLO 3 you have to enable lanplus "
+ "To use fence_ipmilan with HP iLO 3 or HP iLO 4 you have to enable lanplus "
"option (lanplus / -P) and increase wait after operation to "
"4 seconds (power_wait=4 / -T 4)");
printf("</longdesc>\n");
Gitweb: http://git.fedorahosted.org/git/?p=dlm.git;a=commitdiff;h=20eba93563bab4521…
Commit: 20eba93563bab4521c63618a797e662c3bfca3d8
Parent: f0e026c225dda5090ebb5da5622223a4b786e4ed
Author: Jacek Konieczny <jajcus(a)jajcus.net>
AuthorDate: Fri Nov 2 16:39:50 2012 +0100
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Nov 2 10:59:49 2012 -0500
Do not crash uncleanly on SIGINT and SIGHUP
Unclean shut-down of dlm_controld may trigger a node fencing,
this should not be triggered by mistake.
SIGINT is the natural way to stop dlm_controld started on a terminal
with '-D' for debugging – let this work like SIGTERM.
SIGHUP is often used for config reload. dlm_controld doesn't support
that, but when someone tries this by mistake, this is not a reason to
crash.
Signed-off-by: Jacek Konieczny <jajcus(a)jajcus.net>
---
dlm_controld/main.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/dlm_controld/main.c b/dlm_controld/main.c
index 6eafa49..fd469f9 100644
--- a/dlm_controld/main.c
+++ b/dlm_controld/main.c
@@ -1582,6 +1582,15 @@ int main(int argc, char **argv)
rv = sigaction(SIGTERM, &act, NULL);
if (rv < 0)
return -rv;
+ rv = sigaction(SIGINT, &act, NULL);
+ if (rv < 0)
+ return -rv;
+
+ memset(&act, 0, sizeof(act));
+ act.sa_handler = SIG_IGN;
+ rv = sigaction(SIGHUP, &act, NULL);
+ if (rv < 0)
+ return -rv;
memset(&act, 0, sizeof(act));
act.sa_handler = sigchld_handler;
Gitweb: http://git.fedorahosted.org/git/?p=dlm.git;a=commitdiff;h=f0e026c225dda5090…
Commit: f0e026c225dda5090ebb5da5622223a4b786e4ed
Parent: 8b74fc075d10b3a6602c140b6a2bd62bbded9506
Author: Jacek Konieczny <jajcus(a)jajcus.net>
AuthorDate: Fri Nov 2 16:39:49 2012 +0100
Committer: David Teigland <teigland(a)redhat.com>
CommitterDate: Fri Nov 2 10:59:49 2012 -0500
Run dlm.service after sys-kernel-config.mount
dlm_controld requires configfs mounted. systemd can take care for that,
but it does it better if the order is set in the unit file.
Signed-off-by: Jacek Konieczny <jajcus(a)jajcus.net>
---
init/dlm.service | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/init/dlm.service b/init/dlm.service
index d7cf9c7..3c4e53e 100644
--- a/init/dlm.service
+++ b/init/dlm.service
@@ -1,6 +1,6 @@
[Unit]
Description=dlm control daemon
-After=syslog.target network.target corosync.service
+After=syslog.target network.target corosync.service sys-kernel-config.mount
[Service]
Type=forking