SPECS (AC-branch): glibc.spec - useradd/groupadd macros

[glen]

Author: glen                         Date: Sat Jun 18 21:44:35 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- useradd/groupadd macros

---- Files affected:
SPECS:
   glibc.spec (1.583.2.20 -> 1.583.2.21) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.583.2.20 SPECS/glibc.spec:1.583.2.21
--- SPECS/glibc.spec:1.583.2.20	Fri Jun 17 19:32:41 2005
+++ SPECS/glibc.spec	Sat Jun 18 23:44:30 2005
@@ -1118,22 +1118,8 @@
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %pre -n nscd
-if [ -n "`/usr/bin/getgid nscd`" ]; then
-	if [ "`/usr/bin/getgid nscd`" != "144" ]; then
-		echo "Error: group nscd doesn't have gid=144. Correct this before installing nscd." 1>&2
-		exit 1
-	fi
-else
-	/usr/sbin/groupadd -g 144 -r nscd
-fi
-if [ -n "`/bin/id -u nscd 2>/dev/null`" ]; then
-	if [ "`/bin/id -u nscd`" != "144" ]; then
-		echo "Error: user nscd doesn't have uid=144. Correct this before installing nscd." 1>&2
-		exit 1
-	fi
-else
-	/usr/sbin/useradd -u 144 -r -d /tmp -s /bin/false -c "nscd" -g nscd nscd 1>&2
-fi
+%groupadd -P nscd -g 144 -r nscd
+%useradd -P nscd -u 144 -r -d /tmp -s /bin/false -c "nscd" -g nscd nscd
 
 %post -n nscd
 /sbin/chkconfig --add nscd
@@ -1507,6 +1493,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.583.2.21  2005/06/18 21:44:30  glen
+- useradd/groupadd macros
+
 Revision 1.583.2.20  2005/06/17 17:32:41  glen
 - removed fprintf/fopen from postshell.c, saved 7k for the static program
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.583.2.20&r2=1.583.2.21&f=u