Masato Taruishi
taru****@users*****
2005年 1月 25日 (火) 23:28:55 JST
===================================================================
RCS file: ultrapossum/module/server/backup.sh,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- ultrapossum/module/server/backup.sh 2004/07/01 19:16:58 1.11
+++ ultrapossum/module/server/backup.sh 2005/01/25 14:28:55 1.11.2.1
@@ -64,8 +64,16 @@
case "x$format" in
xldif)
+ case "$SLAPD_MAJOR_VERSION" in
+ 2.0|2.1)
+ :
+ ;;
+ *)
+ SLAPCAT_EXTRA_ARGS="$SLAPCAT_EXTRA_ARGS -k -m"
+ ;;
+ esac
backup=$BACKUPDIR/$SUFFIX-`date +%Y%m%d`.ldif
- create_file "$SLAPCAT -b $SUFFIX" "$backup" "$format"
+ create_file "$SLAPCAT $SLAPCAT_EXTRA_ARGS -b $SUFFIX" "$backup" "$format"
;;
xtar)
backup=$BACKUPDIR/$SUFFIX-`date +%Y%m%d`.tar
===================================================================
RCS file: ultrapossum/module/server/createdb.sh,v
retrieving revision 1.32.2.2
retrieving revision 1.32.2.3
diff -u -r1.32.2.2 -r1.32.2.3
--- ultrapossum/module/server/createdb.sh 2004/11/19 12:26:15 1.32.2.2
+++ ultrapossum/module/server/createdb.sh 2005/01/25 14:28:55 1.32.2.3
@@ -59,8 +59,11 @@
cat > $DIRECTORY/DB_CONFIG <<EOF
set_cachesize 0 $createdb_bdb_cachesize 0
set_flags DB_TXN_NOSYNC
-set_flags DB_TXN_NOT_DURABLE
+set_flags DB_LOG_AUTOREMOVE
EOF
+if test "x$SLAPD_BERKLEYDB_SONAME" = "xlibdb-4.2.so"; then
+ echo "set_flags DB_TXN_NOT_DURABLE" >> $DIRECTORY/DB_CONFIG
+fi
;;
esac
@@ -130,8 +133,14 @@
if test "x$HOST" = "x$MASTER"; then
case "$SLAPD_MAJOR_VERSION" in
- 2.2)
- SLAPADD_EXTRA_ARGS="$SLAPADD_EXTRA_ARGS -p -w"
+ 2.0|2.1)
+ :
+ ;;
+ *)
+ SLAPADD_EXTRA_ARGS="$SLAPADD_EXTRA_ARGS -p"
+ if test "x$1" != "xrestore"; then
+ SLAPADD_EXTRA_ARGS="$SLAPADD_EXTRA_ARGS -w"
+ fi
;;
esac
fi