diff options
| author | Jason Wessel <jason.wessel@windriver.com> | 2013-12-06 10:03:00 -0600 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-12-09 10:21:20 -0500 |
| commit | 312a149361b122c8a10a1bb35703ae4e599fc816 (patch) | |
| tree | fc2faabbffff19ea36d044dd9e122873bd82adeb | |
| parent | 09ed6f8a6d36840c0a8d0bb19560cbfda445d6a4 (diff) | |
| download | meta-cloud-services-312a149361b122c8a10a1bb35703ae4e599fc816.tar.gz | |
postgresql-init: Fix logic inversion
The logic was flipped in the wrong place. This makes things right and
fixes up the possibility that the symlink already exists.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
| -rw-r--r-- | meta-openstack/recipes-support/postgresql/postgresql/postgresql-init | 4 | ||||
| -rw-r--r-- | meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta-openstack/recipes-support/postgresql/postgresql/postgresql-init b/meta-openstack/recipes-support/postgresql/postgresql/postgresql-init index 874f24e..c9c3807 100644 --- a/meta-openstack/recipes-support/postgresql/postgresql/postgresql-init +++ b/meta-openstack/recipes-support/postgresql/postgresql/postgresql-init | |||
| @@ -35,9 +35,9 @@ while [ $count -le 10 ] && [ $done -eq 0 ]; do | |||
| 35 | count=`expr $count + 1` | 35 | count=`expr $count + 1` |
| 36 | done | 36 | done |
| 37 | 37 | ||
| 38 | if [ $done -ne 0 ]; then | 38 | if [ $done -eq 0 ]; then |
| 39 | echo "[ERROR] postgres: unable to create admin account" | 39 | echo "[ERROR] postgres: unable to create admin account" |
| 40 | exit 1 | 40 | exit 1 |
| 41 | fi | 41 | fi |
| 42 | 42 | ||
| 43 | ln -s /usr/share/zoneinfo /usr/share/postgresql/timezone | 43 | ln -s /usr/share/zoneinfo /usr/share/postgresql/timezone || true |
diff --git a/meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend b/meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend index 0e281ba..c485e2d 100644 --- a/meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend +++ b/meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend | |||
| @@ -42,7 +42,7 @@ pkg_postinst_${PN}-setup () { | |||
| 42 | fi | 42 | fi |
| 43 | 43 | ||
| 44 | /etc/init.d/postgresql-init | 44 | /etc/init.d/postgresql-init |
| 45 | if [ $? -eq 0 ]; then | 45 | if [ $? -ne 0 ]; then |
| 46 | echo "[ERROR] postgres: unable to create admin account" | 46 | echo "[ERROR] postgres: unable to create admin account" |
| 47 | exit 1 | 47 | exit 1 |
| 48 | fi | 48 | fi |
