r880 - in glibc-package/trunk/debian: . debhelper.in
Author: gotom
Date: 2005-04-11 10:08:32 +0000 (Mon, 11 Apr 2005)
New Revision: 880
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.postinst
glibc-package/trunk/debian/debhelper.in/libc.preinst
Log:
- debian/debhelper.in/libc.preinst: Fix typo, proofreading.
(Closes: #294816, #303478)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2005-04-10 04:24:59 UTC (rev 879)
+++ glibc-package/trunk/debian/changelog 2005-04-11 10:08:32 UTC (rev 880)
@@ -14,6 +14,8 @@
- debian/patches/hurd-weak-aliases.dpatch: Add to fix undefined references
to build putty on Hurd, patched by Michael Banck <mbanck@debian.org>.
(Closes: #295118)
+ - debian/debhelper.in/libc.preinst: Fix typo, proofreading.
+ (Closes: #294816, #303478)
- Bastian Blank <waldi@debian.org>:
- debian/patches/sched-update.dpatch: Update sched_[gs]et_affinity to
Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst 2005-04-10 04:24:59 UTC (rev 879)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2005-04-11 10:08:32 UTC (rev 880)
@@ -229,24 +229,26 @@
echo "done."
if [ -n "$services" ]; then
echo
- echo "Name Service Switch has changed in the C Library: post-installation question."
- echo "Running programs may not be able to do NSS lookups until they are"
- echo "restarted (for services such as ssh, this can affect your ability to"
- echo "login)."
+ echo "Name Service Switch update in the C Library: post-installation question."
+ echo
+ echo "Running services and programs that are using NSS need to be restarted,"
+ echo "otherwise they might not be able to do lookup or authentication any more"
+ echo "(for services such as ssh, this can affect your ability to login)."
echo "Note: restarting sshd/telnetd should not affect any existing connections."
echo
- echo "The services detected are: $services"
+ echo "The services detected are: "
+ echo " $services"
echo
- echo "If other services begin to fail mysteriously after this upgrade,"
- echo "it may be necessary to restart them too. We strongly recommend"
- echo "you to reboot your machine to avoid the NSS related trouble."
+ echo "If other services has begun to fail mysteriously after this upgrade, it is"
+ echo "probably necessary to restart them too. We recommend you to reboot your"
+ echo "machine after the upgrade to avoid the NSS related trouble."
echo
frontend=`echo "$DEBIAN_FRONTEND" | tr '[:upper:]' '[:lower:]'`
if [ "$frontend" = noninteractive ]; then
echo "Non-interactive mode, restarting services"
answer=yes
else
- echo -n "Do you wish to Restart Services? [Y/n] "
+ echo -n "Do you wish to restart services? [Y/n] "
read answer
case $answer in
Y*|y*) answer=yes ;;
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2005-04-10 04:24:59 UTC (rev 879)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2005-04-11 10:08:32 UTC (rev 880)
@@ -62,34 +62,36 @@
service=$(dpkg -s $check 2> /dev/null | awk 'BEGIN{RS="\n\n";FS="\n"}{if ( $2 ~ /Status: .* installed$/ ) { print $1 } }' | cut -f 2 -d ' ')
echo
- echo "Name Service Switch has changed in the C Library: pre-installation question."
+ echo "Name Service Switch update in the C Library: pre-installation question."
echo
- echo "Running programs may not be able to do NSS lookups until they are restarted."
- echo "Some services can not accept all authentication after extracting glibc"
- echo "package into your system. This script automatically restarts some packages"
- echo "for example ssh or telnetd, but other packages for example xdm"
- echo "cannot restart because if it restarts automatically, then your X11 session"
- echo "is disconnected. So you have to logout and stop xdm; you have to"
- echo "restart all such services after upgrading glibc with your hands."
- echo "Known packages that are needed to stop before installing glibc 2.3:"
+ echo "Running services and programs that are using NSS need to be restarted,"
+ echo "otherwise they might not be able to do lookup or authentication any more."
+ echo "The installation process is able to restart some services (such as ssh or"
+ echo "telnetd), but other programs cannot be restarted automatically. One such"
+ echo "program that needs manual stopping and restart after the glibc upgrade by"
+ echo "yourself is xdm - because automatic restart might disconnect your active"
+ echo "X11 sessions."
+ echo
+ echo "Known packages that need to be stopped before the glibc upgrade are:"
echo " $check"
- echo
if [ -n "$service" ]; then
- echo "This script detects services which need to stop: $service"
- echo "If you are invoking these services, please stop before upgrading."
+ echo "This script detects the following services which you are required"
+ echo "to stop before the upgrade:"
+ echo " $service"
else
- echo "This script does not detect services which need to stop."
+ echo "This script does not detect any services to stop now."
fi
- echo "If you want to stop upgrade for the present, please answer the below"
- echo "question as No."
+ echo
+ echo "If you want to interrupt the upgrade now and continue later, please"
+ echo "answer No to the question below."
echo
frontend=`echo "$DEBIAN_FRONTEND" | tr '[:upper:]' '[:lower:]'`
if [ "$frontend" = noninteractive ]; then
- echo "Non-interactive mode, upgrade glibc forcely"
+ echo "Non-interactive mode, upgrade glibc forcedly"
answer=yes
else
- echo -n "Do you want to upgrade glibc? [Y/n] "
+ echo -n "Do you want to upgrade glibc now? [Y/n] "
read answer
case $answer in
Y*|y*) answer=yes ;;
@@ -99,8 +101,8 @@
fi
echo
if [ "$answer" = no ]; then
- echo "Stopped glibc upgrade. Please retry upgrade after you check"
- echo "or stop services with your hands."
+ echo "Stopped glibc upgrade. Please retry the upgrade after you have"
+ echo "checked or stopped services by hand."
exit 1
fi
fi
Reply to: