From a368821c96bc041a8d7f7dab7d4a653d59729d0e Mon Sep 17 00:00:00 2001 From: Akram Hameed <5818835+adhameed@users.noreply.github.com> Date: Wed, 16 Jan 2019 15:12:03 +1100 Subject: postgresql: Update the regex to determine PGMAJORVERSION to match v10+ database clusters Older versions of postgresql would generate MAJVER.MINVER in new clusters. 10+ do not. Update the regex to determine PGMAJORVERSION as a single int. Signed-off-by: Khem Raj --- meta-oe/recipes-dbs/postgresql/files/postgresql.init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-oe/recipes-dbs/postgresql') diff --git a/meta-oe/recipes-dbs/postgresql/files/postgresql.init b/meta-oe/recipes-dbs/postgresql/files/postgresql.init index 4a4f0cd168..1791e68b58 100644 --- a/meta-oe/recipes-dbs/postgresql/files/postgresql.init +++ b/meta-oe/recipes-dbs/postgresql/files/postgresql.init @@ -14,8 +14,8 @@ # PGVERSION is the full package version, e.g., 8.4.0 # Note: the specfile inserts the correct value during package build PGVERSION=9.2.4 -# PGMAJORVERSION is major version, e.g., 8.4 (this should match PG_VERSION) -PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\.[0-9]*\).*$/\1/'` +# PGMAJORVERSION is major version, e.g., 10 (this should match PG_VERSION) +PGMAJORVERSION=`echo "$PGVERSION" | sed 's/^\([0-9]*\).*$/\1/'` # Source function library. . /etc/init.d/functions -- cgit 1.2.3-korg