* Citadel setup: if the environment

variable NO_INIT_SCRIPTS is set, setup will not offer to install
init scripts.  This option is to be used by packagers who wish to
build platform-specific init scripts.

diff --git a/citadel/setup.c b/citadel/setup.c
index 08673310b5007ec170d0bcdf519cb906d8a24d36..f8500529e671e2cab91c3ac03f4d2d88dcc08de4 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -46,8 +46,7 @@
 #define NSSCONF                "/etc/nsswitch.conf"
 
 int setup_type;
-char setup_directory[SIZ];
-char citserver_init_entry[SIZ];
+char setup_directory[PATH_MAX];
 int using_web_installer = 0;
 int enable_home = 1;
 
@@ -1346,7 +1345,10 @@ NEW_INST:
         * If we're running on SysV, install init scripts.
         */
        if (!access("/var/run", W_OK)) {
-               install_init_scripts();
+
+               if (getenv("NO_INIT_SCRIPTS") == NULL) {
+                       install_init_scripts();
+               }
 
                if (!access("/etc/init.d/citadel", X_OK)) {
                        for (a=0; a<=2; ++a) {