Hello community, here is the log from the commit of package glibc checked in at Thu Sep 7 00:56:52 CEST 2006. -------- --- glibc/glibc.changes 2006-08-13 10:46:29.000000000 +0200 +++ glibc/glibc.changes 2006-09-02 15:14:52.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Sep 2 15:14:30 CEST 2006 - schwab@suse.de + +- Fix chroot check in glibc_post_upgrade. + +------------------------------------------------------------------- Old: ---- minmem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.acN0XO/_old 2006-09-07 00:56:33.000000000 +0200 +++ /var/tmp/diff_new_pack.acN0XO/_new 2006-09-07 00:56:33.000000000 +0200 @@ -28,7 +28,7 @@ Obsoletes: ngpt ngpt-devel Autoreqprov: on Version: 2.4 -Release: 32 +Release: 37 %define snapshot_date 2006032009 URL: http://www.gnu.org/software/libc/libc.html PreReq: filesystem @@ -894,6 +894,8 @@ %{_libdir}/libdl_p.a %changelog -n glibc +* Sat Sep 02 2006 - schwab@suse.de +- Fix chroot check in glibc_post_upgrade. * Sun Aug 13 2006 - schwab@suse.de - Fix profiling on ppc. * Thu Jul 27 2006 - pbaudis@suse.cz ++++++ glibc_post_upgrade.c ++++++ --- glibc/glibc_post_upgrade.c 2006-01-30 18:03:02.000000000 +0100 +++ glibc/glibc_post_upgrade.c 2006-09-02 15:13:22.000000000 +0200 @@ -32,6 +32,7 @@ main (void) { char initpath[256]; + struct stat root, init_root; #ifdef REMOVE_TLS_DIRS const char *library[] = {"libc.so.6", "libc.so.6.1", "libm.so.6", @@ -88,7 +89,10 @@ /* Check if we are not inside of some chroot, because we'd just timeout and leave /etc/initrunlvl. */ if (readlink ("/proc/1/exe", initpath, 256) <= 0 || - readlink ("/proc/1/root", initpath, 256) <= 0) + readlink ("/proc/1/root", initpath, 256) <= 0 || + stat ("/proc/1/root", &init_root) < 0 || + stat ("/", &root) < 0 || + init_root.st_dev != root.st_dev || init_root.st_ino != root.st_ino) _exit (0); if (check_elf ("/proc/1/exe")) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org