1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-31 14:50:37 +03:00

Improve clvmd failure message if it's already running.

Allow user to kill clvmd during initialisation.
This commit is contained in:
Patrick Caulfield 2005-01-05 14:41:54 +00:00
parent baea9bf944
commit 86046445ed
2 changed files with 7 additions and 2 deletions

View File

@ -3,6 +3,8 @@ Version 2.00.33 -
gulm clvmd now uses new ccsd key names.
gulm clvmd now doesn't ignore the first node in cluster.conf
Improve clvmd failure message if it's already running.
Allow user to kill clvmd during initialisation.
Version 2.00.32 - 22nd December 2004

View File

@ -216,8 +216,6 @@ int main(int argc, char *argv[])
USR2 causes child threads to exit.
PIPE should be ignored */
signal(SIGUSR2, sigusr2_handler);
signal(SIGTERM, sigterm_handler);
signal(SIGINT, sigterm_handler);
signal(SIGPIPE, SIG_IGN);
/* Block SIGUSR2 in the main process */
@ -275,6 +273,10 @@ int main(int argc, char *argv[])
DEBUGLOG("clvmd ready for work\n");
child_init_signal(SUCCESS);
/* Try to shutdown neatly */
signal(SIGTERM, sigterm_handler);
signal(SIGINT, sigterm_handler);
/* Do some work */
main_loop(local_sock, cmd_timeout);
@ -619,6 +621,7 @@ static void be_daemon()
break;
case DFAIL_LOCAL_SOCK:
fprintf(stderr, "clvmd could not create local socket\n");
fprintf(stderr, "Another clvmd is probably already running\n");
break;
case DFAIL_CLUSTER_IF:
fprintf(stderr, "clvmd could not connect to cluster manager\n");