From 6a2a750725a65819fdc54c11704d990b2aadcd91 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Mon, 14 Apr 2008 21:06:07 +0000 Subject: [PATCH] * just modify /etc/services in batch mode if we are told so by the environment variable ALTER_ETC_SERVICES * make our debs do this. --- citadel/debian/citadel-server.postinst | 3 +++ citadel/setup.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst index e7de429ff..61caab815 100644 --- 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 304d111bb..ac283be36 100644 --- 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 */ -- 2.39.2