From d04b7a4c54a3199839a4d9a46436fbf0f4678b3d Mon Sep 17 00:00:00 2001 From: Charles Short Date: Tue, 8 Feb 2022 14:33:31 +0000 Subject: [PATCH] debian: Remove postgres user from group/passwd files Removed user from group/passwd files to prevent a conflict when the postgresql-common package is installed. Story: 2009221 Task: 43417 Test Plan PASS Apply patch build package PASS Build base-passwd package PASS Run build-image PASS Check to see if postgresql is running when the image is running. PASS Debootstrap Signed-off-by: Charles Short Change-Id: I885ed3467548013ad9c2be3d7d64fafad3703adc --- .../patches/0001-Change-group-passwd.patch | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/base/base-passwd/debian/patches/0001-Change-group-passwd.patch b/base/base-passwd/debian/patches/0001-Change-group-passwd.patch index 6fb20d72b..6bec5a021 100644 --- a/base/base-passwd/debian/patches/0001-Change-group-passwd.patch +++ b/base/base-passwd/debian/patches/0001-Change-group-passwd.patch @@ -1,4 +1,4 @@ -From c88fd4f11479590bbbb35f5ba87fb64112bd2e2c Mon Sep 17 00:00:00 2001 +From 0e556a83e756ba7d1c56e1df9737c3a1a99d1686 Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Thu, 24 Oct 2019 11:53:01 -0500 Subject: [PATCH] Change group,passwd @@ -13,12 +13,12 @@ Signed-off-by: Al Bailey Signed-off-by: Yue Tao Signed-off-by: Charles Short --- - group.master | 18 +++++++++++------- - passwd.master | 15 ++++++++++----- - 2 files changed, 21 insertions(+), 12 deletions(-) + group.master | 17 ++++++++++------- + passwd.master | 14 +++++++++----- + 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/group.master b/group.master -index ad1dd2d..be763b3 100644 +index ad1dd2d..5f540a9 100644 --- a/group.master +++ b/group.master @@ -1,15 +1,11 @@ @@ -45,7 +45,7 @@ index ad1dd2d..be763b3 100644 dip:*:30: www-data:*:33: backup:*:34: -@@ -30,10 +25,19 @@ src:*:40: +@@ -30,10 +25,18 @@ src:*:40: gnats:*:41: shadow:*:42: utmp:*:43: @@ -56,7 +56,6 @@ index ad1dd2d..be763b3 100644 -games:*:60: users:*:100: nogroup:*:65534: -+postgres:x:120: +nova:x:162:nova +barbican:x:978:barbican +neutron:x:164:neutron @@ -68,7 +67,7 @@ index ad1dd2d..be763b3 100644 +ironic:x:1874:ironic +www:x:1877:www diff --git a/passwd.master b/passwd.master -index f1e69a4..1033a78 100644 +index f1e69a4..f1276fe 100644 --- a/passwd.master +++ b/passwd.master @@ -1,12 +1,7 @@ @@ -84,11 +83,10 @@ index f1e69a4..1033a78 100644 news:*:9:9:news:/var/spool/news:/usr/sbin/nologin uucp:*:10:10:uucp:/var/spool/uucp:/usr/sbin/nologin proxy:*:13:13:proxy:/bin:/usr/sbin/nologin -@@ -16,3 +11,13 @@ list:*:38:38:Mailing List Manager:/var/list:/usr/sbin/nologin +@@ -16,3 +11,12 @@ list:*:38:38:Mailing List Manager:/var/list:/usr/sbin/nologin irc:*:39:39:ircd:/run/ircd:/usr/sbin/nologin gnats:*:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/usr/sbin/nologin nobody:*:65534:65534:nobody:/nonexistent:/usr/sbin/nologin -+postgres:x:120:120:PostgreSQL Server:/var/lib/pgsql:/bin/sh +neutron:x:164:164:OpenStack Neutron Daemons:/var/lib/neutron:/sbin/nologin +sysinv:x:168:168:sysinv Daemons:/var/lib/sysinv:/sbin/nologin +snmpd:x:169:169:net-snmp:/usr/share/snmp:/sbin/nologin @@ -99,5 +97,5 @@ index f1e69a4..1033a78 100644 +ironic:x:1874:1874:OpenStack Ironic Daemons:/var/lib/ironic:/sbin/nologin +www:x:1877:1877:www:/home/www:/sbin/nologin -- -2.30.2 +2.32.0