diff -u eglibc-2.12.1/debian/changelog eglibc-2.12.1/debian/changelog --- eglibc-2.12.1/debian/changelog +++ eglibc-2.12.1/debian/changelog @@ -1,3 +1,11 @@ +eglibc (2.12.1-0ubuntu12) natty; urgency=low + + * do not run 'telinit u' on upgrade, as this will break upstart. + touch /var/run/init.upgraded instead, which will force a re-exec just + before remounting root read-only. (LP: #672177) + + -- Clint Byrum Mon, 03 Jan 2011 10:17:18 -0800 + eglibc (2.12.1-0ubuntu11) natty; urgency=low * Update to the eglibc 2.12 branch (r12365). reverted: --- eglibc-2.12.1/debian/changelog.upstream +++ eglibc-2.12.1.orig/debian/changelog.upstream @@ -1,3 +0,0 @@ -The upstream changelog being composed of multiple files with a total size -of more than 1.5MB, they are provided by the glibc-doc package in the -/usr/share/doc/glibc-doc/ directory. diff -u eglibc-2.12.1/debian/debhelper.in/libc.postinst eglibc-2.12.1/debian/debhelper.in/libc.postinst --- eglibc-2.12.1/debian/debhelper.in/libc.postinst +++ eglibc-2.12.1/debian/debhelper.in/libc.postinst @@ -240,9 +240,9 @@ fi # end upgrading and $preversion lt 2.12 fi # Upgrading - # Restart init. If it fails, there is nothing we can do, so - # just ignore the error - telinit u 2> /dev/null || true ; sleep 1 + # Upstart cannot be restarted without losing all of its state, so + # umountroot will run 'telinit u' on reboot if this file exists + touch /var/run/init.upgraded fi #DEBHELPER#