From 39eae73b1d15112df7cd98f04d863f9125aa1089 Mon Sep 17 00:00:00 2001
From: aliriza <aliriza.keskin@pardus.org.tr>
Date: Fri, 2 Dec 2022 11:10:47 +0000
Subject: [PATCH] pam & base-files

---
 sys/apps/shadow/shadow.sysconf         | 10 ----------
 sys/base/base-files/base-files.sysconf |  7 +++++++
 sys/base/base-files/ympbuild           |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/sys/apps/shadow/shadow.sysconf b/sys/apps/shadow/shadow.sysconf
index 5a4415e9..ac6577ef 100644
--- a/sys/apps/shadow/shadow.sysconf
+++ b/sys/apps/shadow/shadow.sysconf
@@ -6,16 +6,6 @@ if [ ! -f /var/lib/ymp/sysconf/shadow/postinstall.done ] ; then
     touch /etc/group
     date > /var/lib/ymp/sysconf/shadow/postinstall.done
 fi
-if ! grep "^users:" /etc/group >/dev/null ; then
-    echo "users:x:100:" >> /etc/group
-fi
-if ! grep "^wheel:" /etc/group >/dev/null ; then
-    echo "wheel:x:10:root" >> /etc/group
-fi
-if ! grep "^root:" /etc/group >/dev/null ; then
-    echo "root:x:0:root" >> /etc/group
-fi
-
 if [ ! -f /etc/shadow ] ; then
     echo "root:*::0:::::" > /etc/shadow
     chmod 600 /etc/shadow
diff --git a/sys/base/base-files/base-files.sysconf b/sys/base/base-files/base-files.sysconf
index 3ffc7860..ccea23d0 100644
--- a/sys/base/base-files/base-files.sysconf
+++ b/sys/base/base-files/base-files.sysconf
@@ -7,6 +7,13 @@ cat /etc/passwd.d/* | sed "s/#.*//g"| while read line ; do
         echo "${line}" >> /etc/passwd
     fi
 done
+cat /etc/group.d/* | sed "s/#.*//g"| while read line ; do
+    if [ -z "${line}" ] ; then
+        : skip empty line
+    elif ! grep "^${line}$" /etc/group > /dev/null ; then
+        echo "${line}" >> /etc/group
+    fi
+done
 if [ ! -f /var/lib/ymp/sysconf/base-files/postinstall.done ]; then
     mkdir -p /var/lib/ymp/sysconf/base-files/
     mkdir /data/user/root -p
diff --git a/sys/base/base-files/ympbuild b/sys/base/base-files/ympbuild
index 1955a6fa..fb147bbc 100644
--- a/sys/base/base-files/ympbuild
+++ b/sys/base/base-files/ympbuild
@@ -9,7 +9,7 @@ maintainer='sulincix'
 license=('GPLv3')
 source=("https://gitlab.com/sulix/devel/sources/base-files/-/archive/$version/base-files-$version.zip"
         "base-files.sysconf")
-md5sums=('1a7f97c99b2ba940d91faade186f4b3f'
+md5sums=('0941492e4e45975adcffc440a72b469f'
          'SKIP')
 arch=(x86_64)
 group=(sys.base)