[glibc] 03/03: debian/debhelper.in/libc.{preinst, postinst}: do not run the NSS check code from a chroot as it might not have an init system installed.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 1ee9a9eca450460978b6c639316806ac5a7d27f3
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue Jul 26 12:04:19 2016 +0200
debian/debhelper.in/libc.{preinst,postinst}: do not run the NSS check code from a chroot as it might not have an init system installed.
---
debian/changelog | 2 ++
debian/debhelper.in/libc.postinst | 2 +-
debian/debhelper.in/libc.preinst | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a4c3427..4f79a5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ glibc (2.23-4) UNRELEASED; urgency=medium
transition for pre-Potato installations.
* debian/debhelper.in/libc.{preinst,postinst}, debian/script.in/nohwcap.sh:
Remove fallback to dpkg --print-architecture for pre-multiarch systems.
+ * debian/debhelper.in/libc.{preinst,postinst}: do not run the NSS check
+ code from a chroot as it might not have an init system installed.
-- Aurelien Jarno <aurel32@debian.org> Tue, 26 Jul 2016 07:51:45 +0200
diff --git a/debian/debhelper.in/libc.postinst b/debian/debhelper.in/libc.postinst
index ce925d3..7378872 100644
--- a/debian/debhelper.in/libc.postinst
+++ b/debian/debhelper.in/libc.postinst
@@ -72,7 +72,7 @@ then
. /usr/share/debconf/confmodule
fi
- if [ -n "$preversion" ]; then
+ if [ -n "$preversion" ] && [ -x "$(which ischroot)" ] && ! ischroot; then
if dpkg --compare-versions "$preversion" lt GLIBC_VERSION; then
check="apache2.2-common apache apache-ssl apache-perl autofs at"
check="$check boa cucipop courier-authdaemon cron cups exim"
diff --git a/debian/debhelper.in/libc.preinst b/debian/debhelper.in/libc.preinst
index d0d379f..7d8b560 100644
--- a/debian/debhelper.in/libc.preinst
+++ b/debian/debhelper.in/libc.preinst
@@ -293,7 +293,7 @@ then
fi
fi
- if [ -n "$preversion" ]; then
+ if [ -n "$preversion" ] && [ -x "$(which ischroot)" ] && ! ischroot; then
# NSS authentication trouble guard
if dpkg --compare-versions "$preversion" lt GLIBC_VERSION; then
if pidof xscreensaver xlockmore >/dev/null; then
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: