Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Patrick Lauer (patrick)" <patrick@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/postgresql-server/files: postgresql.init-8.4 postgresql.init-8.5 postgresql.conf-8.5 postgresql.conf-8.4
Date: Tue, 26 Jan 2010 21:05:02
Message-Id: E1NZsap-0002dc-3E@stork.gentoo.org
1 patrick 10/01/26 21:04:59
2
3 Modified: postgresql.init-8.4 postgresql.init-8.5
4 postgresql.conf-8.5 postgresql.conf-8.4
5 Log:
6 Fixing 8.5 init scripts, adding PG_EXTRA_OPTS to 8.4 for #273867
7 (Portage version: 2.2_rc61/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.3 dev-db/postgresql-server/files/postgresql.init-8.4
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.4?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.4?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.4?r1=1.2&r2=1.3
15
16 Index: postgresql.init-8.4
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.4,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- postgresql.init-8.4 6 Jan 2010 23:36:01 -0000 1.2
23 +++ postgresql.init-8.4 26 Jan 2010 21:04:58 -0000 1.3
24 @@ -1,7 +1,7 @@
25 #!/sbin/runscript
26 # Copyright 1999-2009 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.4,v 1.2 2010/01/06 23:36:01 patrick Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.4,v 1.3 2010/01/26 21:04:58 patrick Exp $
30
31 opts="${opts} reload"
32
33 @@ -34,7 +34,8 @@
34 local retval
35
36 su -l ${PGUSER} \
37 - -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"
38 + -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl start ${WAIT_FOR_START} \
39 + -o '--silent-mode=true ${PGOPTS}'" ${PG_EXTRA_ENV}
40 retval=$?
41 [ $retval -ne 0 ] && eend $retval && return $retval
42
43
44
45
46 1.2 dev-db/postgresql-server/files/postgresql.init-8.5
47
48 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.5?rev=1.2&view=markup
49 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.5?rev=1.2&content-type=text/plain
50 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.5?r1=1.1&r2=1.2
51
52 Index: postgresql.init-8.5
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.5,v
55 retrieving revision 1.1
56 retrieving revision 1.2
57 diff -u -r1.1 -r1.2
58 --- postgresql.init-8.5 26 Jan 2010 19:26:33 -0000 1.1
59 +++ postgresql.init-8.5 26 Jan 2010 21:04:58 -0000 1.2
60 @@ -1,7 +1,7 @@
61 #!/sbin/runscript
62 # Copyright 1999-2009 Gentoo Foundation
63 # Distributed under the terms of the GNU General Public License v2
64 -# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.5,v 1.1 2010/01/26 19:26:33 patrick Exp $
65 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.5,v 1.2 2010/01/26 21:04:58 patrick Exp $
66
67 opts="${opts} reload"
68
69 @@ -34,7 +34,7 @@
70 local retval
71
72 su -l ${PGUSER} \
73 - -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"
74 + -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.5/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"
75 retval=$?
76 [ $retval -ne 0 ] && eend $retval && return $retval
77
78 @@ -59,7 +59,7 @@
79 local retval
80
81 su -l ${PGUSER} \
82 - -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart"
83 + -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.5/bin/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart"
84
85 retval=$?
86 [ $retval -eq 0 ] && eend $retval && return $retval
87 @@ -68,7 +68,7 @@
88 ewarn "Going to shutdown the server anyway."
89
90 su -l ${PGUSER} \
91 - -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -m fast"
92 + -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.5/bin/pg_ctl stop -m fast"
93
94 retval=$?
95 [ $retval -eq 0 ] && eend $retval && return $retval
96 @@ -83,7 +83,7 @@
97 ewarn "Forcing it to shutdown which leads to a recover-run on next startup."
98
99 su -l ${PGUSER} \
100 - -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl stop -m immediate"
101 + -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.5/bin/pg_ctl stop -m immediate"
102
103 retval=$?
104 [ $retval -eq 0 ] && eend $retval && return $retval
105 @@ -95,6 +95,6 @@
106 reload() {
107 ebegin "Reloading PostgreSQL configuration"
108 su -l ${PGUSER} \
109 - -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.4/bin/pg_ctl reload"
110 + -c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.5/bin/pg_ctl reload"
111 eend $?
112 }
113
114
115
116 1.2 dev-db/postgresql-server/files/postgresql.conf-8.5
117
118 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.conf-8.5?rev=1.2&view=markup
119 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.conf-8.5?rev=1.2&content-type=text/plain
120 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.conf-8.5?r1=1.1&r2=1.2
121
122 Index: postgresql.conf-8.5
123 ===================================================================
124 RCS file: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.conf-8.5,v
125 retrieving revision 1.1
126 retrieving revision 1.2
127 diff -u -r1.1 -r1.2
128 --- postgresql.conf-8.5 26 Jan 2010 19:26:33 -0000 1.1
129 +++ postgresql.conf-8.5 26 Jan 2010 21:04:58 -0000 1.2
130 @@ -1,5 +1,5 @@
131 # PostgreSQL's Database Directory
132 -PGDATA="/var/lib/postgresql/8.4/data"
133 +PGDATA="/var/lib/postgresql/8.5/data"
134
135 # PostgreSQL User
136 PGUSER="postgres"
137
138
139
140 1.2 dev-db/postgresql-server/files/postgresql.conf-8.4
141
142 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.conf-8.4?rev=1.2&view=markup
143 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.conf-8.4?rev=1.2&content-type=text/plain
144 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/postgresql-server/files/postgresql.conf-8.4?r1=1.1&r2=1.2
145
146 Index: postgresql.conf-8.4
147 ===================================================================
148 RCS file: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.conf-8.4,v
149 retrieving revision 1.1
150 retrieving revision 1.2
151 diff -u -r1.1 -r1.2
152 --- postgresql.conf-8.4 9 Sep 2009 21:41:25 -0000 1.1
153 +++ postgresql.conf-8.4 26 Jan 2010 21:04:58 -0000 1.2
154 @@ -14,6 +14,8 @@
155 # can be set directly in the configuration-file.
156 #PGOPTS="-N 512 -B 1024"
157
158 +# Pass extra environment variables
159 +#PG_EXTRA_ENV=""
160
161 # SERVER SHUTDOWN:
162 # The server will receive 3 signals in the worst case:
Report Message
Find on MARC Find on Google Groups