diff options
author | Peter Eisentraut <peter_e@gmx.net> | 2017-01-13 12:00:00 -0500 |
---|---|---|
committer | Peter Eisentraut <peter_e@gmx.net> | 2017-01-13 21:25:36 -0500 |
commit | e574f15d6295b12c03ef8810c00976b65933711a (patch) | |
tree | 1cc705093b799a1bf3af211e8d96437609cb7f7d /contrib/start-scripts | |
parent | 5ad966ab1c50e829462f2b3e3ffa59e2d95479e6 (diff) | |
download | postgresql-e574f15d6295b12c03ef8810c00976b65933711a.tar.gz |
Updates to reflect that pg_ctl stop -m fast is the default
Various example and test code used -m fast explicitly, but since it's
the default, this can be omitted now or should be replaced by a better
example.
pg_upgrade is not touched, so it can continue to operate with older
installations.
Diffstat (limited to 'contrib/start-scripts')
-rw-r--r-- | contrib/start-scripts/freebsd | 4 | ||||
-rw-r--r-- | contrib/start-scripts/linux | 4 | ||||
-rwxr-xr-x | contrib/start-scripts/osx/PostgreSQL | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/contrib/start-scripts/freebsd b/contrib/start-scripts/freebsd index 758574b427..87d9b9b357 100644 --- a/contrib/start-scripts/freebsd +++ b/contrib/start-scripts/freebsd @@ -48,10 +48,10 @@ case $1 in echo -n ' postgresql' ;; stop) - su -l $PGUSER -c "$PGCTL stop -D '$PGDATA' -s -m fast" + su -l $PGUSER -c "$PGCTL stop -D '$PGDATA' -s" ;; restart) - su -l $PGUSER -c "$PGCTL stop -D '$PGDATA' -s -m fast -w" + su -l $PGUSER -c "$PGCTL stop -D '$PGDATA' -s -w" su -l $PGUSER -c "$DAEMON -D '$PGDATA' &" >>$PGLOG 2>&1 ;; status) diff --git a/contrib/start-scripts/linux b/contrib/start-scripts/linux index c88433a0e2..d7499c9d1e 100644 --- a/contrib/start-scripts/linux +++ b/contrib/start-scripts/linux @@ -97,12 +97,12 @@ case $1 in ;; stop) echo -n "Stopping PostgreSQL: " - su - $PGUSER -c "$PGCTL stop -D '$PGDATA' -s -m fast" + su - $PGUSER -c "$PGCTL stop -D '$PGDATA' -s" echo "ok" ;; restart) echo -n "Restarting PostgreSQL: " - su - $PGUSER -c "$PGCTL stop -D '$PGDATA' -s -m fast -w" + su - $PGUSER -c "$PGCTL stop -D '$PGDATA' -s -w" test -e "$PG_OOM_ADJUST_FILE" && echo "$PG_MASTER_OOM_SCORE_ADJ" > "$PG_OOM_ADJUST_FILE" su - $PGUSER -c "$DAEMON_ENV $DAEMON -D '$PGDATA' &" >>$PGLOG 2>&1 echo "ok" diff --git a/contrib/start-scripts/osx/PostgreSQL b/contrib/start-scripts/osx/PostgreSQL index d38504dcc2..48c098c8f1 100755 --- a/contrib/start-scripts/osx/PostgreSQL +++ b/contrib/start-scripts/osx/PostgreSQL @@ -90,14 +90,14 @@ StartService () { StopService () { ConsoleMessage "Stopping PostgreSQL database server" - sudo -u $PGUSER sh -c "$PGCTL stop -D '${PGDATA}' -s -m fast" + sudo -u $PGUSER sh -c "$PGCTL stop -D '${PGDATA}' -s" } RestartService () { if [ "${POSTGRESQL:=-NO-}" = "-YES-" ]; then ConsoleMessage "Restarting PostgreSQL database server" # should match StopService: - sudo -u $PGUSER sh -c "$PGCTL stop -D '${PGDATA}' -s -m fast" + sudo -u $PGUSER sh -c "$PGCTL stop -D '${PGDATA}' -s" # should match StartService: if [ "${ROTATELOGS}" = "1" ]; then sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" 2>&1 | ${LOGUTIL} "${PGLOG}" ${ROTATESEC} & |