From 1b000116fb7264d94f428dbfe658048546ba45e6 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Tue, 7 Jun 2005 01:36:40 +0000 Subject: [PATCH] Ipcrm -> ipcclean in error message: --------------------------------------------------------------------------- While playing around, I got the following error message: -- FATAL: pre-existing shared memory block (key 5432001, ID 90898435) is still in use HINT: If you're sure there are no old server processes still running, remove the shared memory block with the command "ipcrm", or just delete the file "/home/hlinnaka/pgsql/data/postmaster.pid". --- Thats normal because I used "kill -9 postmaster" to shut down. The hint advises me to use "ipcrm", but there's the "ipcclean" script in bin for just this purpose. The hint should probably advise to use ipcclean. The attached patch replaces all occurances of "ipcrm" with "ipcclean" in src/backend/utils/init/miscinit.c and all the translations in src/backend/po. While reviewing the patch, I noticed a likely typo in hr.po. While I don't speak Croatian, the translation seems to advise to use the "icpm(1)" command. I changed that to "ipcclean" too. Heikki Linnakangas --- src/backend/utils/init/miscinit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 3f34653cb2..d538b221e4 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.139 2005/04/14 20:03:26 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.140 2005/06/07 01:36:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -648,7 +648,7 @@ CreateLockFile(const char *filename, bool amPostmaster, errhint("If you're sure there are no old " "server processes still running, remove " "the shared memory block with " - "the command \"ipcrm\", or just delete the file \"%s\".", + "the command \"ipcclean\", or just delete the file \"%s\".", filename))); } }