Author: qboosh Date: Sun Feb 20 14:06:00 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- unified id/getgid usage, removed -f from groupadd
---- Files affected:
SPECS:
cvs-nserver.spec (1.80 -> 1.81)
---- Diffs:
================================================================
Index: SPECS/cvs-nserver.spec
diff -u SPECS/cvs-nserver.spec:1.80 SPECS/cvs-nserver.spec:1.81
--- SPECS/cvs-nserver.spec:1.80 Sat Feb 19 00:37:30 2005
+++ SPECS/cvs-nserver.spec Sun Feb 20 15:05:55 2005
@@ -263,26 +263,26 @@
[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir}
>/dev/null 2>&1
%pre common
-if [ -n "`getgid cvs`" ]; then
- if [ "`getgid cvs`" != "52" ]; then
+if [ -n "`/usr/bin/getgid cvs`" ]; then
+ if [ "`/usr/bin/getgid cvs`" != "52" ]; then
echo "Error: group cvs doesn't have gid=52. Correct this before
installing cvs-nserver." 1>&2
exit 1
fi
else
echo "Adding group cvs GID=52."
- /usr/sbin/groupadd -g 52 -r -f cvs
+ /usr/sbin/groupadd -g 52 -r cvs
fi
-if [ -n "`getgid cvsadmin`" ]; then
- if [ "`getgid cvsadmin`" != "53" ]; then
+if [ -n "`/usr/bin/getgid cvsadmin`" ]; then
+ if [ "`/usr/bin/getgid cvsadmin`" != "53" ]; then
echo "Error: group cvsadmin doesn't have gid=53. Correct this
before installing cvs-nserver." 1>&2
exit 1
fi
else
echo "Adding group cvsadmin GID=53."
- /usr/sbin/groupadd -g 53 -r -f cvsadmin
+ /usr/sbin/groupadd -g 53 -r cvsadmin
fi
-if [ -n "`id -u cvs 2>/dev/null`" ]; then
- if [ "`id -u cvs`" != "52" ]; then
+if [ -n "`/bin/id -u cvs 2>/dev/null`" ]; then
+ if [ "`/bin/id -u cvs`" != "52" ]; then
echo "Error: user cvs doesn't have uid=52. Correct this before
installing cvs-nserver." 1>&2
exit 1
fi
@@ -375,6 +375,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.81 2005/02/20 14:05:55 qboosh
+- unified id/getgid usage, removed -f from groupadd
+
Revision 1.80 2005/02/18 23:37:30 qboosh
- added fix for off-by-one in cat_stringbuf() to segv patch
- release 15
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/cvs-nserver.spec?r1=1.80&r2=1.81&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
