Delete the users and groups which is declared in systemd.

(cherry picked from commit 264fb0e66e0df7790ec88a18b231ad5d8d6c1778)

Delete-the-users-and-groups-declared-in-systemd.patch

@@ -0,0 +1,58 @@
+From 3221c8c3231de69b5e2db400f3b7bcaf6a918bb3 Mon Sep 17 00:00:00 2001
+From: hongjinghao <hongjinghao@huawei.com>
+Date: Sat, 11 May 2024 14:55:47 +0800
+Subject: [PATCH] Delete the users and groups declared in systemd.
+These users/groups have already been declared in systemd basic.conf, if we also declare them here, systemd-sysusers will report warnings.
+https://gitee.com/src-openeuler/setup/pulls/30/
+
+---
+ sysusers.d/20-setup-groups.conf | 14 --------------
+ sysusers.d/20-setup-users.conf  |  2 --
+ 2 files changed, 16 deletions(-)
+
+diff --git a/sysusers.d/20-setup-groups.conf b/sysusers.d/20-setup-groups.conf
+index d69ff91..867f107 100644
+--- a/sysusers.d/20-setup-groups.conf
++++ b/sysusers.d/20-setup-groups.conf
+@@ -1,24 +1,10 @@
+-g root 0
+ g bin 1
+ g daemon 2
+ g sys 3
+-g adm 4
+-g tty 5
+-g disk 6
+-g lp 7
+ g mem 8
+-g kmem 9
+-g wheel 10
+-g cdrom 11
+ g mail 12
+ g man 15
+-g dialout 18
+ g floppy 19
+ g games 20
+-g tape 33
+-g video 39
+ g ftp 50
+ g lock 54
+-g audio 63
+-g users 100
+-g nobody 65534
+diff --git a/sysusers.d/20-setup-users.conf b/sysusers.d/20-setup-users.conf
+index bea0ab3..7d197c4 100644
+--- a/sysusers.d/20-setup-users.conf
++++ b/sysusers.d/20-setup-users.conf
+@@ -1,4 +1,3 @@
+-u root 0:0 "Super User" /root /bin/bash
+ u bin 1:1 "bin" /bin -
+ u daemon 2:2 "daemon" /sbin -
+ u adm 3:4 "adm" /var/adm -
+@@ -10,4 +9,3 @@ u mail 8:12 "mail" /var/spool/mail -
+ u operator 11:0 "operator" /root -
+ u games 12:100 "games" /usr/games -
+ u ftp 14:50 "FTP User" /var/ftp -
+-u nobody 65534:65534 "Kernel Overflow User" - -
+-- 
+2.33.0
+

setup.spec

@@ -1,12 +1,13 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.14.5
-Release: 1
+Release: 2
 License: Public Domain
 Group: System Environment/Base
 URL: https://pagure.io/setup/
 Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
 Patch0: support-filesystems-xfs.patch
+Patch1: Delete-the-users-and-groups-declared-in-systemd.patch
 BuildArch: noarch
 BuildRequires: systemd
 BuildRequires: bash tcsh perl-interpreter
@@ -21,7 +22,8 @@ setup files, such as passwd, group, and profile.
 
 %prep
 %autosetup -n %{name}-%{version} -p1
-./generate-sysusers-fragments.sh
+# https://gitee.com/src-openeuler/setup/pulls/30/
+#./generate-sysusers-fragments.sh
 ./shadowconvert.sh
 
 %build
@@ -132,6 +134,9 @@ end
 /etc/dnf/protected.d/%{name}.conf
 
 %changelog
+* Sat May 11 2024 hongjinghao <hongjinghao@huawei.com> - 2.14.5-2
+- Delete the users and groups which is declared in systemd.
+
 * Wed Jan 31 2024 hongjinghao <hongjinghao@huawei.com> - 2.14.5-1
 - update to 2.14.5