r3864 - in glibc-package/branches/eglibc-2.10/debian: . debhelper.in
Author: aurel32
Date: 2009-10-02 08:49:04 +0000 (Fri, 02 Oct 2009)
New Revision: 3864
Modified:
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.postinst
Log:
Merge from unstable
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-10-02 08:27:19 UTC (rev 3863)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-10-02 08:49:04 UTC (rev 3864)
@@ -128,6 +128,12 @@
-- Clint Adams <schizo@debian.org> Wed, 30 Sep 2009 14:40:25 -0400
+eglibc (2.9-28) UNRELEASED; urgency=low
+
+ * libc.postinst: only call telinit on Linux as originally.
+
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 02 Oct 2009 10:26:35 +0200
+
eglibc (2.9-27) unstable; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.postinst 2009-10-02 08:27:19 UTC (rev 3863)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.postinst 2009-10-02 08:49:04 UTC (rev 3864)
@@ -205,10 +205,12 @@
# Generate cache file /usr/lib/gconv/gconv-modules.cache
iconvconfig || true
- if [ "$(stat -c %d/%i /)" = "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ]; then
- # the devicenumber/inode pair of / is the same as that of /sbin/init's
- # root, so we're *not* in a chroot
- (telinit u ; sleep 1)
+ if [ "`uname -s`" = Linux ]; then
+ if [ "$(stat -c %d/%i /)" = "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ]; then
+ # the devicenumber/inode pair of / is the same as that of /sbin/init's
+ # root, so we're *not* in a chroot
+ (telinit u ; sleep 1)
+ fi
fi
fi
Reply to: