Masato Taruishi
taru****@users*****
2004年 10月 26日 (火) 21:59:23 JST
===================================================================
RCS file: ultrapossum/modules.in,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ultrapossum/modules.in 2004/10/26 11:39:57 1.51
+++ ultrapossum/modules.in 2004/10/26 12:59:23 1.52
@@ -52,7 +52,6 @@
TESTSCRIPTSDIR=${TESTSCRIPTSDIR:-$TESTDIR/test.d}
CONFDIR=${CONFDIR:-$localstatedir/lib/$PACKAGE/conf.d/$ULTRAPOSSUM_PROJECT}
APPSDIR=${APPSDIR:-$SHAREDIR/apps.d}
-SERVICEDIR=${SERVICEDIR:-$SHAREDIR/service.d}
MODULEDIR=${MODULEDIR:-$SHAREDIR/module.d}
UPDATEDIR=${UPDATEDIR:-$SHAREDIR/update.d}
BACKUPDIR=${BACKUPDIR:-$localstatedir/backups/@PACKAGE@}
===================================================================
RCS file: ultrapossum/service,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/service 2004/10/26 12:34:23 1.4
+++ ultrapossum/service 2004/10/26 12:59:23 1.5
@@ -27,15 +27,7 @@
case "x$1" in
xprotocol)
- if test -d "$SERVICEDIR"; then
- for s in `find $SERVICEDIR -type f`; do
- module=ULTRAPOSSUM_MODULE_"`basename $s | cut -d- -f2- | tr 'a-z' 'A-Z'`"
- if test "x${!module}" = "xinstalled"; then
- source_shell $s
- echo $protocols
- fi
- done | tr ' ' '\n' | sort | uniq
- fi
+ ultrapossum-config variable | grep _PROVIDER | cut -d_ -f1 | tr A-Z a-z
;;
xprovider)
if test "x$2" != "x"; then
@@ -43,13 +35,6 @@
ss="$@"
else
ss=`$0 protocol`
- fi
- for s in `$0 protocol`
- do
- eval "`echo $s | tr 'a-z' 'A-Z'`_PROVIDER=\"$s://$FQDN/\""
- done
- if test -f $SYSCONFDIR/service.cf; then
- source_shell $SYSCONFDIR/service.cf
fi
for s in $ss
do