Masato Taruishi
taru****@users*****
2004年 10月 19日 (火) 18:14:04 JST
===================================================================
RCS file: demo/uml/debian/config,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- demo/uml/debian/config 2004/10/17 18:25:55 1.11
+++ demo/uml/debian/config 2004/10/19 09:14:04 1.12
@@ -26,27 +26,36 @@
}
fi
-uml_hosts="$MASTER"
+if test "x$MASTER" != "x$HOST"; then
+ uml_hosts="$MASTER"
+fi
if test "x$ULTRAMONKEYNODES" != "x"; then
for h in $ULTRAMONKEYNODES
do
- uml_hosts="$uml_hosts, $h"
+ uml_hosts="$uml_hosts $h"
done
fi
if test "x$SLURPDSLAVES" != "x"; then
for h in $SLURPDSLAVES
do
- uml_hosts="$uml_hosts, $h"
+ uml_hosts="$uml_hosts $h"
done
fi
if test "x$SYNCBACKUPS" != "x"; then
for h in $SYNCBACKUPS
do
if test "x$h" != "x$MASTER"; then
- uml_hosts="$uml_hosts, $h"
+ uml_hosts="$uml_hosts $h"
fi
done
fi
+for h in $UML_HOSTS
+do
+ if ! include $h "$uml_hosts"; then
+ uml_hosts="$uml_hosts $h"
+ fi
+done
+uml_hosts=$(echo $uml_hosts | sed 's/ /, /g')
uml_mirror_candidates=$(egrep "^deb[[:space:]]+(http|ftp)://[^[:space:]]+[[:space:]]+[^[:space:]]+[[:space:]]+" /etc/apt/sources.list | sed -e 's/^deb[ ]*\([^ ]*\).*/\1/g' | tr '\n' '#' | sed 's/#/, /g')