Masato Taruishi
taru****@sourc*****
2004年 4月 20日 (火) 18:05:06 JST
===================================================================
RCS file: ultrapossum/module/server/00server,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ultrapossum/module/server/00server 2004/04/20 08:25:13 1.25
+++ ultrapossum/module/server/00server 2004/04/20 09:05:06 1.26
@@ -167,7 +167,7 @@
SLAPD_BACKEND_DB_TYPE=$SLAPD_DEFAULT_BACKEND_DB_TYPE
fi
-ULTRAPOSSUM_APPS=`find /usr/share/ultrapossum/apps.d/ -type f | xargs -n1 basename | tr '\n' ' '`
+ULTRAPOSSUM_APPS=`find /usr/share/ultrapossum/apps.d/ -type f | grep -v tmp | xargs -n1 basename`
ULTRAPOSSUM_INDEX=`grep index $ULTRAPOSSUM_MASTER_SLAPD_CONF 2> /dev/null || true`
ULTRAPOSSUM_SLAPD_CONFIN=`ultrapossum_getconf ULTRAPOSSUM_SLAPD_CONFIN $TEMPLATEDIR/slapd-$SLAPD_BACKEND_DB_TYPE.conf.in`
===================================================================
RCS file: ultrapossum/module/server/apps,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/module/server/apps 2004/04/02 02:34:09 1.4
+++ ultrapossum/module/server/apps 2004/04/20 09:05:06 1.5
@@ -28,10 +28,7 @@
trap "eval `ultrapossum-config term`" 0
getapps() {
- for cf in `/bin/ls $APPSDIR`
- do
- echo $cf
- done
+ echo "$ULTRAPOSSUM_APPS"
}
case "$1" in
===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ultrapossum/module/server/update-server 2004/04/20 08:25:13 1.32
+++ ultrapossum/module/server/update-server 2004/04/20 09:05:06 1.33
@@ -97,7 +97,7 @@
/bin/rm -f $INITLDIF
fi
- index_new=`grep index $ULTRAPOSSUM_MASTER_SLAPD_CONF || true`
+ index_new=`grep index $ULTRAPOSSUM_MASTER_SLAPD_CONF`
if test "x$ULTRAPOSSUM_INDEX" != "x$index_new"; then
if test "`$MODULEDIR/server/startup status`" = "running"; then
echo "W: index configuration is changed while server is running" 1>&2