r3932 - in glibc-package/trunk/debian: . debhelper.in script.in
Author: aurel32
Date: 2009-11-03 22:36:49 +0000 (Tue, 03 Nov 2009)
New Revision: 3932
Modified:
glibc-package/trunk/debian/changelog
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:
* Don't ask to stop gdm before an upgrade, but run reload in the postint
Closes: #553362.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-11-03 18:44:52 UTC (rev 3931)
+++ glibc-package/trunk/debian/changelog 2009-11-03 22:36:49 UTC (rev 3932)
@@ -1,3 +1,11 @@
+eglibc (2.10.1-6) UNRELEASED; urgency=low
+
+ [ Aurelien Jarno ]
+ * Don't ask to stop gdm before an upgrade, but run reload in the postint
+ Closes: #553362.
+
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 03 Nov 2009 23:36:40 +0100
+
eglibc (2.10.1-5) unstable; urgency=low
[ Samuel Thibault ]
Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst 2009-11-03 18:44:52 UTC (rev 3931)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2009-11-03 22:36:49 UTC (rev 3932)
@@ -95,10 +95,10 @@
check="$check boa cucipop courier-authdaemon cron cups 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 openldapd proftpd 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"
+ check="$check webmin dropbear gdm"
# NSS services check: NSS_CHECK
if [ -n "$services" ]; then
@@ -156,16 +156,29 @@
else
idl=$(ls /etc/rc${rl}.d/S??${service} 2> /dev/null | head -1)
fi
- echo -n " $service: stopping..."
- $idl stop > /dev/null 2>&1 || true
- sleep 2
- echo -n "starting..."
- if $idl start > /dev/null 2>&1; then
- echo "done."
- else
- echo "FAILED! ($?)"
- failed="$service $failed"
- fi
+ case "$service" in
+ gdm)
+ echo -n " $service: reloading..."
+ if $idl reload > /dev/null 2>&1; then
+ echo "done."
+ else
+ echo "FAILED! ($?)"
+ failed="$service $failed"
+ fi
+ ;;
+ *)
+ echo -n " $service: stopping..."
+ $idl stop > /dev/null 2>&1 || true
+ sleep 2
+ echo -n "starting..."
+ if $idl start > /dev/null 2>&1; then
+ echo "done."
+ else
+ echo "FAILED! ($?)"
+ failed="$service $failed"
+ fi
+ ;;
+ esac
done
echo
if [ -n "$failed" ]; then
@@ -199,7 +212,7 @@
else
echo "Nothing to restart."
fi
- fi # end upgrading and $preversion lt 2.6-1
+ fi # end upgrading and $preversion lt 2.10-2
fi # Upgrading
# Generate cache file /usr/lib/gconv/gconv-modules.cache
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2009-11-03 18:44:52 UTC (rev 3931)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2009-11-03 22:36:49 UTC (rev 3932)
@@ -90,7 +90,7 @@
fi
fi
- check="gdm kdm proftpd postgresql xdm"
+ check="kdm postgresql xdm"
# NSS services check: NSS_CHECK
if [ -n "$services" ]; then
if [ -f /usr/share/debconf/confmodule ] ; then
@@ -140,7 +140,7 @@
exit 1
fi
fi
- fi # end upgrading and $preversion lt 2.9-1
+ fi # end upgrading and $preversion lt 2.10-2
fi # Upgrading
# This will keep us from using hwcap libs (optimized) during an
Modified: glibc-package/trunk/debian/script.in/nsscheck.sh
===================================================================
--- glibc-package/trunk/debian/script.in/nsscheck.sh 2009-11-03 18:44:52 UTC (rev 3931)
+++ glibc-package/trunk/debian/script.in/nsscheck.sh 2009-11-03 22:36:49 UTC (rev 3932)
@@ -17,8 +17,10 @@
rl=$(runlevel | sed 's/.*\ //')
for service in $check; do
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- idl=$(ls /etc/init.d/${service} 2> /dev/null | head -n 1)
- if [ -n "$idl" ] && [ -x $idl ]; then
+ # Should be "if invoke-rc.d ${service} status; then", but
+ # it is not yet supported by all scripts
+ invoke-rc.d -query ${service} start ; status=$?
+ if [ "$status" = "104" ] ; then
services="$service $services"
else
echo "WARNING: init script for $service not found."
Reply to: