From 2f56890d89245a7e56c27f28980b3b05343c0606 Mon Sep 17 00:00:00 2001
From: cjs <cjs>
Date: Sat, 9 Jul 2005 04:24:52 +0000
Subject: Remove any -m ... options from common_args when doing an initdb, as
 this command doesn't accept that option.

---
 databases/postgresql80-server/files/pgsql.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'databases/postgresql80-server')

diff --git a/databases/postgresql80-server/files/pgsql.sh b/databases/postgresql80-server/files/pgsql.sh
index 837d8c89a6e..a52422dd14a 100644
--- a/databases/postgresql80-server/files/pgsql.sh
+++ b/databases/postgresql80-server/files/pgsql.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pgsql.sh,v 1.2 2005/05/16 01:02:20 cjs Exp $
+# $NetBSD: pgsql.sh,v 1.3 2005/07/09 04:24:52 cjs Exp $
 #
 # PostgreSQL database rc.d control script
 #
@@ -77,7 +77,9 @@ pgsql_initdb()
 		@CHOWN@ ${pgsql_user} ${pgsql_home}
 		@CHGRP@ ${pgsql_group} ${pgsql_home}
 		@CHMOD@ 0750 ${pgsql_home}
-		eval doit_command=\"${initdb} ${common_args} ${flags}\"
+		common_args_without_m=$(echo "${common_args}" |\
+		    sed -e 's/-m [a-z]*//')
+		eval doit_command=\"${initdb} ${common_args_without_m} ${flags}\"
 		doit="@SU@ -m ${pgsql_user} -c '${doit_command}'"
 		eval $doit
 	fi
-- 
cgit v1.2.3