From 4eab886af5ec025bca69151ea5a7254f11c3af45aad8d009e34e5bbd75ce686c Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 7 May 2013 10:21:12 +0000 Subject: [PATCH] - Fix check for XEN build in glibc_post_upgrade OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=281 --- glibc-testsuite.changes | 10 ++++++++++ glibc-utils.changes | 10 ++++++++++ glibc.changes | 5 +++++ glibc_post_upgrade.c | 2 +- 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes index 893cc45..3ae05c7 100644 --- a/glibc-testsuite.changes +++ b/glibc-testsuite.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue May 7 10:00:00 UTC 2013 - schwab@suse.de + +- Fix check for XEN build in glibc_post_upgrade + +------------------------------------------------------------------- +Sun Apr 14 02:41:52 UTC 2013 - crrodriguez@opensuse.org + +- Do not order nscd after syslog.target + ------------------------------------------------------------------- Mon Mar 4 14:16:43 UTC 2013 - schwab@suse.de diff --git a/glibc-utils.changes b/glibc-utils.changes index 893cc45..3ae05c7 100644 --- a/glibc-utils.changes +++ b/glibc-utils.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue May 7 10:00:00 UTC 2013 - schwab@suse.de + +- Fix check for XEN build in glibc_post_upgrade + +------------------------------------------------------------------- +Sun Apr 14 02:41:52 UTC 2013 - crrodriguez@opensuse.org + +- Do not order nscd after syslog.target + ------------------------------------------------------------------- Mon Mar 4 14:16:43 UTC 2013 - schwab@suse.de diff --git a/glibc.changes b/glibc.changes index 7f54fb5..3ae05c7 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 7 10:00:00 UTC 2013 - schwab@suse.de + +- Fix check for XEN build in glibc_post_upgrade + ------------------------------------------------------------------- Sun Apr 14 02:41:52 UTC 2013 - crrodriguez@opensuse.org diff --git a/glibc_post_upgrade.c b/glibc_post_upgrade.c index 9e97c79..ab52f16 100644 --- a/glibc_post_upgrade.c +++ b/glibc_post_upgrade.c @@ -140,8 +140,8 @@ main (void) timeout and leave /etc/initrunlvl. */ if (readlink ("/proc/1/exe", initpath, 256) <= 0 || readlink ("/proc/1/root", initpath, 256) <= 0 || + access ("/.buildenv", F_OK) == 0 || /* XEN build */ stat ("/proc/1/root", &init_root) < 0 || - stat ("/.buildenv", &init_root) < 0 || /* XEN build */ stat ("/", &root) < 0 || init_root.st_dev != root.st_dev || init_root.st_ino != root.st_ino) _exit (0);