Masato Taruishi
taru****@users*****
2004年 9月 7日 (火) 19:30:45 JST
===================================================================
RCS file: ultrapossum/modules.in,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ultrapossum/modules.in 2004/07/13 08:25:07 1.43
+++ ultrapossum/modules.in 2004/09/07 10:30:45 1.44
@@ -382,13 +382,13 @@
for f in `find $APPSCONFDIR -name '*.cf'`
do
if test -f $f; then
- ULTRAPOSSUMCF="$ULTRAPOSSUMCF $f"
+ cfs="$cfs $f"
fi
done
for f in `find $APPSCONFDIR -name "*.cf$EXTRACONFSUFFIX"`
do
if test -f $f; then
- ULTRAPOSSUMCF="$ULTRAPOSSUMCF $f"
+ cfs="$cfs $f"
fi
done
fi
@@ -402,8 +402,8 @@
. $SYSCONFDIR/projects/$ULTRAPOSSUM_PROJECT$EXTRACONFSUFFIX
fi
- if test "x$ULTRAPOSSUMCF" != "x"; then
- for cf in $ULTRAPOSSUMCF
+ if test "x$cfs" != "x"; then
+ for cf in $cfs
do
if test -f "$cf"; then
if test -r "$cf"; then
===================================================================
RCS file: ultrapossum/update-ultrapossum,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ultrapossum/update-ultrapossum 2004/07/03 06:58:21 1.15
+++ ultrapossum/update-ultrapossum 2004/09/07 10:30:45 1.16
@@ -55,6 +55,7 @@
up_to_date() {
if ! test -f "$CONFSTATUS"; then
+ echo "status change detected" 1>&2
return 1
fi
if test "$SLAPDCONF" -nt "$CONFSTATUS"; then
@@ -74,10 +75,10 @@
configure() {
conftemp=`tempfile`
chmod 640 $conftemp
- getconfig | grep -v SLAPROOTPW > $conftemp
+ getconfig | grep -v SLAPROOTPW | grep -v CHROOTFILES > $conftemp
# little evil
if ! up_to_date ||
- ! test -f "$CONFSTATUS" || ! diff $CONFSTATUS $conftemp > /dev/null
+ diff -u $CONFSTATUS $conftemp | egrep "^\+[^+]" | cut -d+ -f2 | cut -d= -f1 | egrep . 1>&2
then
sanity_module