Author: aurel32
Date: 2010-07-27 03:02:19 +0000 (Tue, 27 Jul 2010)
New Revision: 4365
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/debhelper.in/libc.postinst
Log:
  * Always try to restart init when needed, and ignore the possible errors.
    Closes: #588922, 590175.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2010-06-30 00:50:51 UTC (rev 
4364)
+++ glibc-package/trunk/debian/changelog        2010-07-27 03:02:19 UTC (rev 
4365)
@@ -9,8 +9,12 @@
   [ Clint Adams ]
   * Reflect EGLIBC in binary package short descriptions.  closes: #587586.
 
- -- Clint Adams <sch...@debian.org>  Tue, 29 Jun 2010 20:49:29 -0400
+  [ Aurelien Jarno ]
+  * Always try to restart init when needed, and ignore the possible errors.
+    Closes: #588922, 590175.
 
+ -- Aurelien Jarno <aure...@debian.org>  Tue, 27 Jul 2010 05:00:08 +0200
+
 eglibc (2.11.2-2) unstable; urgency=medium
 
   [ Aurelien Jarno ]

Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst       2010-06-30 
00:50:51 UTC (rev 4364)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst       2010-07-27 
03:02:19 UTC (rev 4365)
@@ -212,13 +212,9 @@
        fi # end upgrading and $preversion lt 2.11-1
     fi # Upgrading
 
-    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
+    # Restart init. If it fails, there is nothing we can do, so 
+    # just ignore the error
+    telinit u 2> /dev/null || true ; sleep 1
 fi
 
 #DEBHELPER#


-- 
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1odaqx-0002ai...@alioth.debian.org

Reply via email to