From dd9a7b025a651d00250e1977dc44c0167f1c748f Mon Sep 17 00:00:00 2001 From: Nickolai Zeldovich Date: Thu, 1 Nov 2001 05:10:38 +0000 Subject: [PATCH] afsdb-default-in-rc-files-20011031 enable afsdb using rc files --- src/afsd/afs.conf.linux | 6 ++++++ src/afsd/afs.rc.linux | 6 ++++++ src/afsd/afs.rc.sgi | 7 ++++++- src/afsd/afs.rc.solaris | 6 +++++- src/afsd/afs.rc.solaris.2.7 | 6 +++++- src/afsd/afs.rc.solaris.2.8 | 6 +++++- src/afsd/afs.rc.solaris.2.9 | 12 ++++++++---- src/afsd/afs.rc.solaris.2_5 | 6 +++++- 8 files changed, 46 insertions(+), 9 deletions(-) diff --git a/src/afsd/afs.conf.linux b/src/afsd/afs.conf.linux index f299203e7..6514339f4 100644 --- a/src/afsd/afs.conf.linux +++ b/src/afsd/afs.conf.linux @@ -13,6 +13,12 @@ AFS_CLIENT=on AFS_SERVER=off +# ENABLE_AFSDB and ENABLE_DYNROOT determine whether AFSDB support and +# Dynroot support (dynamically generated /afs), respectively, should be +* enabled in the AFS client. +ENABLE_AFSDB=on +ENABLE_DYNROOT=off + # AFS client configuration options: XXLARGE="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000" XLARGE="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000" diff --git a/src/afsd/afs.rc.linux b/src/afsd/afs.rc.linux index 72d184463..57cfc9dfa 100644 --- a/src/afsd/afs.rc.linux +++ b/src/afsd/afs.rc.linux @@ -218,6 +218,12 @@ choose_afsdoptions() { fi fi AFSD_OPTIONS="$OPTIONS $VERBOSE" + if is_on $ENABLE_AFSDB; then + AFSD_OPTIONS="$AFSD_OPTIONS -afsdb" + fi + if is_on $ENABLE_DYNROOT; then + AFSD_OPTIONS="$AFSD_OPTIONS -dynroot" + fi } case "$1" in diff --git a/src/afsd/afs.rc.sgi b/src/afsd/afs.rc.sgi index e1566adda..96b9f2069 100644 --- a/src/afsd/afs.rc.sgi +++ b/src/afsd/afs.rc.sgi @@ -28,10 +28,15 @@ # These options should be given in /etc/config/afsd.options. # If afsd.options does not exist then $OPTIONS is used. # + +# EXTRAOPTS can be used to enable/disable AFSDB support (-afsdb) +# and Dynroot (dynamically-generated /afs) support (-dynroot). +EXTRAOPTS="-afsdb" + LARGE="-stat 2800 -dcache 2400 -daemons 5 -volumes 128" MEDIUM="-stat 2000 -dcache 800 -daemons 3 -volumes 70" SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50" -OPTIONS=$MEDIUM +OPTIONS="$MEDIUM $EXTRAOPTS" CONFIG=/etc/config IS_ON=/etc/chkconfig diff --git a/src/afsd/afs.rc.solaris b/src/afsd/afs.rc.solaris index 416699411..9fef4f65f 100644 --- a/src/afsd/afs.rc.solaris +++ b/src/afsd/afs.rc.solaris @@ -17,6 +17,10 @@ CONFIG=/usr/vice/etc/config AFSDOPT=$CONFIG/afsd.options PACKAGE=$CONFIG/package.options +# EXTRAOPTS can be used to enable/disable AFSDB support (-afsdb) +# and Dynroot (dynamically-generated /afs) support (-dynroot). +EXTRAOPTS="-afsdb" + LARGE="-stat 2800 -dcache 2400 -daemons 5 -volumes 128" MEDIUM="-stat 2000 -dcache 800 -daemons 3 -volumes 70" SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50" @@ -24,7 +28,7 @@ SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50" if [ -f $AFSDOPT ]; then OPTIONS=`cat $AFSDOPT` else - OPTIONS=$MEDIUM + OPTIONS="$MEDIUM $EXTRAOPTS" fi # Need the commands ps, awk, kill, sleep diff --git a/src/afsd/afs.rc.solaris.2.7 b/src/afsd/afs.rc.solaris.2.7 index c096da9bd..6cda6aa0c 100644 --- a/src/afsd/afs.rc.solaris.2.7 +++ b/src/afsd/afs.rc.solaris.2.7 @@ -18,6 +18,10 @@ CONFIG=/usr/vice/etc/config AFSDOPT=$CONFIG/afsd.options PACKAGE=$CONFIG/package.options +# EXTRAOPTS can be used to enable/disable AFSDB support (-afsdb) +# and Dynroot (dynamically-generated /afs) support (-dynroot). +EXTRAOPTS="-afsdb" + LARGE="-stat 2800 -dcache 2400 -daemons 5 -volumes 128" MEDIUM="-stat 2000 -dcache 800 -daemons 3 -volumes 70" SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50" @@ -25,7 +29,7 @@ SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50" if [ -f $AFSDOPT ]; then OPTIONS=`cat $AFSDOPT` else - OPTIONS=$MEDIUM + OPTIONS="$MEDIUM $EXTRAOPTS" fi # Need the commands ps, awk, kill, sleep diff --git a/src/afsd/afs.rc.solaris.2.8 b/src/afsd/afs.rc.solaris.2.8 index 64e089f1c..e08e894bd 100755 --- a/src/afsd/afs.rc.solaris.2.8 +++ b/src/afsd/afs.rc.solaris.2.8 @@ -11,6 +11,10 @@ CONFIG=/usr/vice/etc/config AFSDOPT=$CONFIG/afsd.options PACKAGE=$CONFIG/package.options +# EXTRAOPTS can be used to enable/disable AFSDB support (-afsdb) +# and Dynroot (dynamically-generated /afs) support (-dynroot). +EXTRAOPTS="-afsdb" + LARGE="-stat 2800 -dcache 2400 -daemons 5 -volumes 128" MEDIUM="-stat 2000 -dcache 800 -daemons 3 -volumes 70" SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50" @@ -18,7 +22,7 @@ SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50" if [ -f $AFSDOPT ]; then OPTIONS=`cat $AFSDOPT` else - OPTIONS=$MEDIUM + OPTIONS="$MEDIUM $EXTRAOPTS" fi # Need the commands ps, awk, kill, sleep diff --git a/src/afsd/afs.rc.solaris.2.9 b/src/afsd/afs.rc.solaris.2.9 index 00967eb9b..b4c91e0f5 100644 --- a/src/afsd/afs.rc.solaris.2.9 +++ b/src/afsd/afs.rc.solaris.2.9 @@ -11,14 +11,18 @@ CONFIG=/usr/vice/etc/config AFSDOPT=$CONFIG/afsd.options PACKAGE=$CONFIG/package.options -LARGE="-stat 2800 -dcache 2400 -daemons 5 -volumes 128 -afsdb" -MEDIUM="-stat 2000 -dcache 800 -daemons 3 -volumes 70 -afsdb" -SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50 -afsdb" +# EXTRAOPTS can be used to enable/disable AFSDB support (-afsdb) +# and Dynroot (dynamically-generated /afs) support (-dynroot). +EXTRAOPTS="-afsdb" + +LARGE="-stat 2800 -dcache 2400 -daemons 5 -volumes 128" +MEDIUM="-stat 2000 -dcache 800 -daemons 3 -volumes 70" +SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50" if [ -f $AFSDOPT ]; then OPTIONS=`cat $AFSDOPT` else - OPTIONS=$MEDIUM + OPTIONS="$MEDIUM $EXTRAOPTS" fi # Need the commands ps, awk, kill, sleep diff --git a/src/afsd/afs.rc.solaris.2_5 b/src/afsd/afs.rc.solaris.2_5 index 499b32e6e..692be6380 100644 --- a/src/afsd/afs.rc.solaris.2_5 +++ b/src/afsd/afs.rc.solaris.2_5 @@ -17,6 +17,10 @@ CONFIG=/usr/vice/etc/config AFSDOPT=$CONFIG/afsd.options PACKAGE=$CONFIG/package.options +# EXTRAOPTS can be used to enable/disable AFSDB support (-afsdb) +# and Dynroot (dynamically-generated /afs) support (-dynroot). +EXTRAOPTS="-afsdb" + LARGE="-stat 2800 -dcache 2400 -daemons 5 -volumes 128" MEDIUM="-stat 2000 -dcache 800 -daemons 3 -volumes 70" SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50" @@ -24,7 +28,7 @@ SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50" if [ -f $AFSDOPT ]; then OPTIONS=`cat $AFSDOPT` else - OPTIONS=$MEDIUM + OPTIONS="$MEDIUM $EXTRAOPTS" fi # Need the commands ps, awk, kill, sleep -- 2.39.5