* just modify /etc/services in batch mode if we are told so by the environment variab...

* make our debs do this.

diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst
index e7de429ff2c89f240b3097e7be760ce2c09e55cf..61caab815e69c854e16154c61957575682436900 100644 (file)
--- a/citadel/debian/citadel-server.postinst
+++ b/citadel/debian/citadel-server.postinst
@@ -37,6 +37,9 @@ case "$1" in
         export CREATE_INITTAB_ENTRY=no
         export NO_INIT_SCRIPTS=yes
 
+#This is not debian conformant, and uniq to the citadel.org debs.
+       export ALTER_ETC_SERVICES=yes
+#
         echo "applying your settings."
         /usr/lib/citadel-server/setup -q
 

diff --git a/citadel/setup.c b/citadel/setup.c
index 304d111bbe19fc81918a9fd8202ef806f8b444ab..ac283be36d15dcd703cd8dd71af363a55cef34f6 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -1237,7 +1237,9 @@ NEW_INST:
        unlink("citadel.log");
        unlink("weekly");
 
-       check_services_entry(); /* Check /etc/services */
+       if (((setup_type == UI_SILENT) && (getenv("ALTER_ETC_SERVICES")!=NULL)) || 
+           (setup_type != UI_SILENT))
+               check_services_entry(); /* Check /etc/services */
 #ifndef __CYGWIN__
        delete_inittab_entry(); /* Remove obsolete /etc/inittab entry */
        check_xinetd_entry();   /* Check /etc/xinetd.d/telnet */