r2821 - in glibc-package/trunk/debian: debhelper.in script.in
Author: aurel32
Date: 2008-02-26 19:52:02 +0000 (Tue, 26 Feb 2008)
New Revision: 2821
Modified:
glibc-package/trunk/debian/debhelper.in/libc.postinst
glibc-package/trunk/debian/debhelper.in/libc.preinst
glibc-package/trunk/debian/script.in/nsscheck.sh
Log:
The services to check are not the same in preinst and postinst
Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst 2008-02-20 07:07:05 UTC (rev 2820)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2008-02-26 19:52:02 UTC (rev 2821)
@@ -156,8 +156,15 @@
ln -sf spool/mail /var/mail
fi
if dpkg --compare-versions $preversion lt 2.6-1; then
-
- # NSS services check: NSS_CHECK
+ check="apache2-common apache apache-ssl apache-perl autofs at"
+ check="$check boa cucipop courier-authdaemon cron cupsys exim"
+ check="$check exim4-base dovecot-common cucipop lprng lpr"
+ check="$check lpr-ppd mysql-server nis openbsd-inetd"
+ check="$check openldapd postfix postfix-tls rsync samba"
+ check="$check sasl2-bin slapd smail sendmail snmpd ssh"
+ check="$check spamassassin vsftpd wu-ftpd wu-ftpd-academ wwwoffle"
+ check="$check webmin dropbear"
+ # NSS services check: NSS_CHECK
if [ -n "$services" ]; then
if [ -f /usr/share/debconf/confmodule ] ; then
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2008-02-20 07:07:05 UTC (rev 2820)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2008-02-26 19:52:02 UTC (rev 2821)
@@ -45,7 +45,8 @@
# NSS authentication trouble guard
if dpkg --compare-versions $2 lt 2.6-1; then
- # NSS services check: NSS_CHECK
+ check="xdm kdm gdm postgresql xscreensaver proftpd"
+ # NSS services check: NSS_CHECK
echo
echo "Name Service Switch update in the C Library: pre-installation question."
echo
Modified: glibc-package/trunk/debian/script.in/nsscheck.sh
===================================================================
--- glibc-package/trunk/debian/script.in/nsscheck.sh 2008-02-20 07:07:05 UTC (rev 2820)
+++ glibc-package/trunk/debian/script.in/nsscheck.sh 2008-02-26 19:52:02 UTC (rev 2821)
@@ -1,12 +1,4 @@
echo -n "Checking for services that may need to be restarted..."
- check="apache2-common apache apache-ssl apache-perl autofs at"
- check="$check boa cucipop courier-authdaemon cron cupsys exim"
- check="$check exim4-base dovecot-common cucipop lprng lpr"
- check="$check lpr-ppd mysql-server nis openbsd-inetd"
- check="$check openldapd postfix postfix-tls proftpd rsync samba"
- check="$check sasl2-bin slapd smail sendmail snmpd ssh"
- check="$check spamassassin vsftpd wu-ftpd wu-ftpd-academ wwwoffle"
- check="$check webmin dropbear"
# Only get the ones that are installed, and configured
check=$(dpkg -s $check 2> /dev/null | egrep '^Package:|^Status:' | awk '{if ($1 ~ /^Package:/) { package=$2 } else if ($0 ~ /^Status: .* installed$/) { print package }}')
# some init scripts don't match the package names
Reply to: