@@ -85,7 +85,6 @@ static char *pg_config = NULL;
8585static char * pgdata_opt = NULL ;
8686static char * post_opts = NULL ;
8787static const char * progname ;
88- static bool idempotent = false;
8988static char * log_file = NULL ;
9089static char * exec_path = NULL ;
9190static char * register_servicename = "PostgreSQL" ;/* FIXME: + version ID? */
@@ -774,15 +773,9 @@ do_start(void)
774773{
775774old_pid = get_pgpid ();
776775if (old_pid != 0 )
777- {
778- if (idempotent )
779- exit (0 );
780- else
781- {
782- write_stderr (_ ("%s: another server might be running\n" ),progname );
783- exit (1 );
784- }
785- }
776+ write_stderr (_ ("%s: another server might be running; "
777+ "trying to start server anyway\n" ),
778+ progname );
786779}
787780
788781read_post_opts ();
@@ -866,8 +859,6 @@ do_stop(void)
866859
867860if (pid == 0 )/* no pid file */
868861{
869- if (idempotent )
870- exit (0 );
871862write_stderr (_ ("%s: PID file \"%s\" does not exist\n" ),progname ,pid_file );
872863write_stderr (_ ("Is server running?\n" ));
873864exit (1 );
@@ -1771,9 +1762,9 @@ do_help(void)
17711762printf (_ ("%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n\n" ),progname );
17721763printf (_ ("Usage:\n" ));
17731764printf (_ (" %s init[db] [-D DATADIR] [-s] [-o \"OPTIONS\"]\n" ),progname );
1774- printf (_ (" %s start [-w] [-t SECS] [-D DATADIR] [-s] [-I] [- l FILENAME] [-o \"OPTIONS\"]\n" ),progname );
1775- printf (_ (" %s stop [-W] [-t SECS] [-D DATADIR] [-s] [-I] [- m SHUTDOWN-MODE]\n" ),progname );
1776- printf (_ (" %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
1765+ printf (_ (" %s start [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n" ),progname );
1766+ printf (_ (" %s stop [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n" ),progname );
1767+ printf (_ (" %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
17771768" [-o \"OPTIONS\"]\n" ),progname );
17781769printf (_ (" %s reload [-D DATADIR] [-s]\n" ),progname );
17791770printf (_ (" %s status [-D DATADIR]\n" ),progname );
@@ -1806,8 +1797,6 @@ do_help(void)
18061797printf (_ (" -o OPTIONS command line options to pass to postgres\n"
18071798" (PostgreSQL server executable) or initdb\n" ));
18081799printf (_ (" -p PATH-TO-POSTGRES normally not necessary\n" ));
1809- printf (_ ("\nOptions for start or stop:\n" ));
1810- printf (_ (" -I, --idempotent don't error if server already running or stopped\n" ));
18111800printf (_ ("\nOptions for stop, restart, or promote:\n" ));
18121801printf (_ (" -m, --mode=MODE MODE can be \"smart\", \"fast\", or \"immediate\"\n" ));
18131802
@@ -1986,7 +1975,6 @@ main(int argc, char **argv)
19861975{"silent" ,no_argument ,NULL ,'s' },
19871976{"timeout" ,required_argument ,NULL ,'t' },
19881977{"core-files" ,no_argument ,NULL ,'c' },
1989- {"idempotent" ,no_argument ,NULL ,'I' },
19901978{NULL ,0 ,NULL ,0 }
19911979};
19921980
@@ -2052,7 +2040,7 @@ main(int argc, char **argv)
20522040/* process command-line options */
20532041while (optind < argc )
20542042{
2055- while ((c = getopt_long (argc ,argv ,"cD:Il :m:N:o:p:P:sS:t:U:wW" ,long_options ,& option_index ))!= -1 )
2043+ while ((c = getopt_long (argc ,argv ,"cD:l :m:N:o:p:P:sS:t:U:wW" ,long_options ,& option_index ))!= -1 )
20562044{
20572045switch (c )
20582046{
@@ -2078,9 +2066,6 @@ main(int argc, char **argv)
20782066pgdata_D );
20792067break ;
20802068}
2081- case 'I' :
2082- idempotent = true;
2083- break ;
20842069case 'l' :
20852070log_file = pg_strdup (optarg );
20862071break ;