starlingx/integ
Code Issues Proposed changes

debian: Remove barbican user and group

Browse Source 
Let barbican package create the user and group.

Test:
PASS: build-pkgs
PASS: build-image
PASS: install-iso
PASS: check user and group created by packaging
PASS: bootstrap

Depends-On: https://review.opendev.org/c/starlingx/upstream/+/836048
Story: 2009101
Task: 43417
Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
Change-Id: Ie99844f5dd8db6b017db78e9a8e7880778380feb
This commit is contained in:
Dan Voiculeasa 2022-03-31 20:20:49 +03:00
parent d05f33d775
commit 2ca99db88a
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
base/base-passwd/debian/patches/0001-Change-group-passwd.patch
View File

@ -1,7 +1,7 @@
From 0e556a83e756ba7d1c56e1df9737c3a1a99d1686 Mon Sep 17 00:00:00 2001 From 7deb684d4cd0d9d1f176941c0e0482f9668119d7 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com> From: Al Bailey <Al.Bailey@windriver.com>
Date: Thu, 24 Oct 2019 11:53:01 -0500 Date: Thu, 24 Oct 2019 11:53:01 -0500
Subject: [PATCH] Change group,passwd Subject: [PATCH 1/2] Change group,passwd
Porting this patch from 'setup' package of CentOS. Removing the Porting this patch from 'setup' package of CentOS. Removing the
change of uidgid, because no such file in base-passwd, and Debian change of uidgid, because no such file in base-passwd, and Debian
@ -12,13 +12,14 @@ Signed-off-by: Andy Ning <andy.ning@windriver.com>
Signed-off-by: Al Bailey <Al.Bailey@windriver.com> Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
Signed-off-by: Yue Tao <yue.tao@windriver.com> Signed-off-by: Yue Tao <yue.tao@windriver.com>
Signed-off-by: Charles Short <charles.short@windriver.com> Signed-off-by: Charles Short <charles.short@windriver.com>
Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
--- ---
group.master | 17 ++++++++++------- group.master | 16 +++++++++-------
passwd.master | 14 +++++++++----- passwd.master | 13 ++++++++-----
2 files changed, 19 insertions(+), 12 deletions(-) 2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/group.master b/group.master diff --git a/group.master b/group.master
index ad1dd2d..5f540a9 100644 index ad1dd2d..69f4fff 100644
--- a/group.master --- a/group.master
+++ b/group.master +++ b/group.master
@@ -1,15 +1,11 @@ @@ -1,15 +1,11 @@
@ -45,7 +46,7 @@ index ad1dd2d..5f540a9 100644
dip:*:30: dip:*:30:
www-data:*:33: www-data:*:33:
backup:*:34: backup:*:34:
@@ -30,10 +25,18 @@ src:*:40: @@ -30,10 +25,17 @@ src:*:40:
gnats:*:41: gnats:*:41:
shadow:*:42: shadow:*:42:
utmp:*:43: utmp:*:43:
@ -57,7 +58,6 @@ index ad1dd2d..5f540a9 100644
users:*:100: users:*:100:
nogroup:*:65534: nogroup:*:65534:
+nova:x:162:nova +nova:x:162:nova
+barbican:x:978:barbican
+neutron:x:164:neutron +neutron:x:164:neutron
+ceilometer:x:166:ceilometer +ceilometer:x:166:ceilometer
+sysinv:x:168:sysinv +sysinv:x:168:sysinv
@ -67,7 +67,7 @@ index ad1dd2d..5f540a9 100644
+ironic:x:1874:ironic +ironic:x:1874:ironic
+www:x:1877:www +www:x:1877:www
diff --git a/passwd.master b/passwd.master diff --git a/passwd.master b/passwd.master
index f1e69a4..f1276fe 100644 index f1e69a4..cea9d1b 100644
--- a/passwd.master --- a/passwd.master
+++ b/passwd.master +++ b/passwd.master
@@ -1,12 +1,7 @@ @@ -1,12 +1,7 @@
@ -83,7 +83,7 @@ index f1e69a4..f1276fe 100644
news:*:9:9:news:/var/spool/news:/usr/sbin/nologin news:*:9:9:news:/var/spool/news:/usr/sbin/nologin
uucp:*:10:10:uucp:/var/spool/uucp:/usr/sbin/nologin uucp:*:10:10:uucp:/var/spool/uucp:/usr/sbin/nologin
proxy:*:13:13:proxy:/bin:/usr/sbin/nologin proxy:*:13:13:proxy:/bin:/usr/sbin/nologin
@@ -16,3 +11,12 @@ list:*:38:38:Mailing List Manager:/var/list:/usr/sbin/nologin @@ -16,3 +11,11 @@ list:*:38:38:Mailing List Manager:/var/list:/usr/sbin/nologin
irc:*:39:39:ircd:/run/ircd:/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 gnats:*:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/usr/sbin/nologin
nobody:*:65534:65534:nobody:/nonexistent:/usr/sbin/nologin nobody:*:65534:65534:nobody:/nonexistent:/usr/sbin/nologin
@ -91,11 +91,10 @@ index f1e69a4..f1276fe 100644
+sysinv:x:168:168:sysinv Daemons:/var/lib/sysinv:/sbin/nologin +sysinv:x:168:168:sysinv Daemons:/var/lib/sysinv:/sbin/nologin
+snmpd:x:169:169:net-snmp:/usr/share/snmp:/sbin/nologin +snmpd:x:169:169:net-snmp:/usr/share/snmp:/sbin/nologin
+fm:x:195:195:fm-mgr:/var/lib/fm:/sbin/nologin +fm:x:195:195:fm-mgr:/var/lib/fm:/sbin/nologin
+barbican:x:982:978:Barbican Key Manager user account.:/var/lib/barbican:/sbin/nologin
+ceilometer:x:991:166:OpenStack ceilometer Daemons:/var/lib/ceilometer:/sbin/nologin +ceilometer:x:991:166:OpenStack ceilometer Daemons:/var/lib/ceilometer:/sbin/nologin
+nova:x:994:162:OpenStack Nova Daemons:/var/lib/nova:/sbin/nologin +nova:x:994:162:OpenStack Nova Daemons:/var/lib/nova:/sbin/nologin
+ironic:x:1874:1874:OpenStack Ironic Daemons:/var/lib/ironic:/sbin/nologin +ironic:x:1874:1874:OpenStack Ironic Daemons:/var/lib/ironic:/sbin/nologin
+www:x:1877:1877:www:/home/www:/sbin/nologin +www:x:1877:1877:www:/home/www:/sbin/nologin
-- --
2.32.0 2.30.0