STABLE12-bos-new-config-option-20021210

FIXES 1224

based on patch from nneul@umr.edu but including the switch

(cherry picked from commit 69cb63ef545b4c8dc4e3b307b474ade4951d9691)

diff --git a/acconfig.h b/acconfig.h
index 679dd81add25a8df0ad01591dc1b409bc2ca87ce..c976a2b14560176fe064a8347e7d763b7494e509 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -26,6 +26,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 
 #undef BITMAP_LATER
 #undef BOS_RESTRICTED_MODE
+#undef BOS_NEW_CONFIG
 #undef FAST_RESTART
 #undef FULL_LISTVOL_SWITCH
 

diff --git a/acinclude.m4 b/acinclude.m4
index abbbaf8af9b242768fdb200734afe304c52d86b8..1eb61d0a067a237f765f73a790dae475b102c809 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -9,7 +9,7 @@ AC_DEFUN(OPENAFS_CONFIGURE_COMMON,[
 AC_CANONICAL_HOST
 SRCDIR_PARENT=`pwd`
 
-#BOZO_SAVE_CORES BOS_RESTRICTED_MODE BOS_NEW_CONFIG pam sia
+#BOZO_SAVE_CORES pam sia
 AC_ARG_WITH(afs-sysname,
 [  --with-afs-sysname=sys    use sys for the afs sysname]
 )
@@ -21,6 +21,8 @@ AC_ARG_ENABLE( afsdb,
 [  --disable-afsdb                     disable AFSDB RR support],, enable_afsdb="yes")
 AC_ARG_ENABLE( bos-restricted-mode,
 [  --enable-bos-restricted-mode        enable bosserver restricted mode which disables certain bosserver functionality],, enable_bos_restricted_mode="no")
+AC_ARG_ENABLE( bos-new-config,
+[  --enable-bos-new-config             enable bosserver pickup of BosConfig.new on restarts],, enable_bos_new_config="no")
 AC_ARG_ENABLE( namei-fileserver,
 [  --enable-namei-fileserver           force compilation of namei fileserver in preference to inode fileserver],, enable_namei_fileserver="no")
 AC_ARG_ENABLE( fast-restart,
@@ -576,6 +578,10 @@ if test "$enable_bos_restricted_mode" = "yes"; then
        AC_DEFINE(BOS_RESTRICTED_MODE, 1, [define if you want to want bos restricted mode])
 fi
 
+if test "$enable_bos_new_config" = "yes"; then
+       AC_DEFINE(BOS_NEW_CONFIG, 1, [define if you want to enable automatic renaming of BosConfig.new to BosConfig at startup])
+fi
+
 if test "$enable_namei_fileserver" = "yes"; then
        AC_DEFINE(AFS_NAMEI_ENV, 1, [define if you want to want namei fileserver])
 fi