Masato Taruishi
taru****@users*****
2004年 10月 9日 (土) 15:45:23 JST
=================================================================== RCS file: demo/uml/20uml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- demo/uml/20uml 2004/09/29 08:52:13 1.6 +++ demo/uml/20uml 2004/10/09 06:45:23 1.7 @@ -36,6 +36,7 @@ UML_MULTICASTADDR=$(ultrapossum_getconf UML_MULTICASTADDR "") UML_LOCALNETPREFIX=$(ultrapossum_getconf UML_LOCALNETPREFIX "192.168.0") UML_CONFDIR=$(ultrapossum_getconf UML_CONFDIR "$SYSCONFDIR/uml") + UML_SUGGESTS=$(ultrapossum_getconf UML_SUGGESTS "ultrapossum-common") fi # Parsing configuration file =================================================================== RCS file: demo/uml/map,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- demo/uml/map 2004/10/06 13:18:20 1.9 +++ demo/uml/map 2004/10/09 06:45:23 1.10 @@ -32,18 +32,24 @@ id=`num` +suggests="$UML_SUGGESTS" + if include "$arg" "$ULTRAMONKEYNODES"; then - suggests="ultrapossum-ultramonkey" -elif include "$arg" "$MASTER $SLAVES"; then - suggests="ultrapossum" - u=`dpkg-query -W --showformat='${package} ,${version},\n' 'ultrapossum*' | grep -v ,, | cut -d' ' -f1 | tr \\\n ' '` + suggests="$suggests ultrapossum-ultramonkey" +elif include "$arg" "$LDAPHOSTS"; then + suggests="$suggests ultrapossum" + u=`dpkg-query -W --showformat='${package} ,${version},\n' '*ultrapossum*' | grep -v ,, | cut -d' ' -f1 | tr \\\n ' '` for p in $u do - case $p in - ultrapossum-sasl|ultrapossum-snmp|ultrapossum-tls|ultrapossum-debconf) + if ! include "$p" "$suggests"; then + case $p in + ultrapossum-failover|ultrapossum-ultramonkey|ultrapossum-test|ultrapossum-uml|ultrapossum-dnsbalance) + ;; + *) suggests="$suggests $p" ;; - esac + esac + fi done if test "x$BACKUP" != "x" && include "$arg" "$MASTER $BACKUP"; then suggests="$suggests ultrapossum-failover" =================================================================== RCS file: demo/uml/uml.cf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- demo/uml/uml.cf 2004/09/29 08:52:13 1.4 +++ demo/uml/uml.cf 2004/10/09 06:45:23 1.5 @@ -16,3 +16,5 @@ #UML_LOCALNETPREFIX="192.168.0" +#UML_SUGGESTS="ultrapossum-common" +