Masato Taruishi
taru****@users*****
2004年 4月 5日 (月) 20:51:17 JST
===================================================================
RCS file: ultrapossum/module/server/createdb.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/module/server/createdb.sh 2004/04/05 11:39:43 1.11
+++ ultrapossum/module/server/createdb.sh 2004/04/05 11:51:17 1.12
@@ -81,7 +81,7 @@
if test -f "$INITLDIF" && egrep "^dn: " "$INITLDIF" > /dev/null; then
extraldifs="$extraldifs $INITLDIF"
fi
- extraldifs="$extraldifs `find $INITLDIFDIR -type f | tr '\n' ' '`"
+ extraldifs="$extraldifs `find $INITLDIFDIR -type f | sort | tr '\n' ' '`"
else
ldiffile=$DIRECTORY/$HOST.ldif
if ! test -s $ldiffile; then
@@ -107,7 +107,7 @@
echo "failed" 1>&2
exit 1
fi
-echo $extraldifs
+
for l in $extraldifs
do
echo -n "Setting up `basename $l .ldif` entries... " 1>&2
===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ultrapossum/module/server/update-server 2004/04/05 11:39:43 1.29
+++ ultrapossum/module/server/update-server 2004/04/05 11:51:17 1.30
@@ -104,7 +104,7 @@
/bin/rm -rf "$INITLDIFDIR"
install -d "$INITLDIFDIR"
- find $ULTRAPOSSUM_INIT_LDIF_TEMPLATEDIR -type f | while read f; do
+ find $ULTRAPOSSUM_INIT_LDIF_TEMPLATEDIR -type f | sort | while read f; do
echo -n "Configuring `basename $f` LDIF... " 1>&2
sed -e "s/#SUFFIX#/$SUFFIX/" < $f > $INITLDIFDIR/`basename $f`
echo "done" 1>&2