Attachment 636748 Details for Bug 870535 – Patch to systemd F18 branch to apply Kay's git commit

[patch] Patch to systemd F18 branch to apply Kay's git commit

0001-make-sure-the-kernel-localtime-adjustment-is-carried.patch (text/plain), 4.83 KB, created by Michel Alexandre Salim on 2012-11-01 17:19:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Alexandre Salim

Created: 2012-11-01 17:19:09 UTC

Size: 4.83 KB

patch

obsolete

>From 4205663b514c3f0c0e35edf110409b4243df6e9a Mon Sep 17 00:00:00 2001
>From: Michel Alexandre Salim <salimma@fedoraproject.org>
>Date: Fri, 2 Nov 2012 00:15:35 +0700
>Subject: [PATCH] make sure the kernel localtime adjustment is carried out
> only once
>
>- https://bugzilla.redhat.com/show_bug.cgi?id=870535
>---
> systemd-195-no_timewarp_in_initrd.patch | 61 +++++++++++++++++++++++++++++++++
> systemd.spec                            | 10 +++++-
> 2 files changed, 70 insertions(+), 1 deletion(-)
> create mode 100644 systemd-195-no_timewarp_in_initrd.patch
>
>diff --git a/systemd-195-no_timewarp_in_initrd.patch b/systemd-195-no_timewarp_in_initrd.patch
>new file mode 100644
>index 0000000..eb3dcc0
>--- /dev/null
>+++ b/systemd-195-no_timewarp_in_initrd.patch
>@@ -0,0 +1,61 @@
>+From 19e65613563dd9c14cf1ce58aa6e151de8fb90c2 Mon Sep 17 00:00:00 2001
>+From: Kay Sievers <kay@vrfy.org>
>+Date: Sat, 27 Oct 2012 14:23:32 +0000
>+Subject: hwclock: do not seal the kernel's time-warp call from inside the initrd
>+
>+---
>+diff --git a/src/core/main.c b/src/core/main.c
>+index e094efe..4da8ecb 100644
>+--- a/src/core/main.c
>++++ b/src/core/main.c
>+@@ -1350,8 +1350,15 @@ int main(int argc, char *argv[]) {
>+                                         log_error("Failed to apply local time delta, ignoring: %s", strerror(-r));
>+                                 else
>+                                         log_info("RTC configured in localtime, applying delta of %i minutes to system time.", min);
>+-                        } else {
>+-                                /* Do dummy first-time call to seal the kernel's time warp magic */
>++                        } else if (!in_initrd()) {
>++                                /*
>++                                 * Do dummy first-time call to seal the kernel's time warp magic
>++                                 *
>++                                 * Do not call this this from inside the initrd. The initrd might not
>++                                 * carry /etc/adjtime with LOCAL, but the real system could be set up
>++                                 * that way. In such case, we need to delay the time-warp or the sealing
>++                                 * until we reach the real system.
>++                                 */
>+                                 hwclock_reset_timezone();
>+ 
>+                                 /* Tell the kernel our time zone */
>+diff --git a/src/shared/hwclock.c b/src/shared/hwclock.c
>+index 0e8fa45..f9adf03 100644
>+--- a/src/shared/hwclock.c
>++++ b/src/shared/hwclock.c
>+@@ -199,14 +199,14 @@ int hwclock_set_timezone(int *min) {
>+         const struct timeval *tv_null = NULL;
>+         struct timespec ts;
>+         struct tm *tm;
>+-        int minuteswest;
>++        int minutesdelta;
>+         struct timezone tz;
>+ 
>+         assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0);
>+         assert_se(tm = localtime(&ts.tv_sec));
>+-        minuteswest = tm->tm_gmtoff / 60;
>++        minutesdelta = tm->tm_gmtoff / 60;
>+ 
>+-        tz.tz_minuteswest = -minuteswest;
>++        tz.tz_minuteswest = -minutesdelta;
>+         tz.tz_dsttime = 0; /* DST_NONE*/
>+ 
>+         /*
>+@@ -217,7 +217,7 @@ int hwclock_set_timezone(int *min) {
>+         if (settimeofday(tv_null, &tz) < 0)
>+                 return -errno;
>+         if (min)
>+-                *min = minuteswest;
>++                *min = minutesdelta;
>+         return 0;
>+ }
>+ 
>+--
>+cgit v0.9.0.2-2-gbebe
>diff --git a/systemd.spec b/systemd.spec
>index b79b471..7d82411 100644
>--- a/systemd.spec
>+++ b/systemd.spec
>@@ -22,7 +22,7 @@ Url:            http://www.freedesktop.org/wiki/Software/systemd
> # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION!
> 
> Version:        195
>-Release:        5%{?gitcommit:.git%{gitcommit}}%{?dist}
>+Release:        6%{?gitcommit:.git%{gitcommit}}%{?dist}
> # For a breakdown of the licensing, see README
> License:        LGPLv2+ and MIT and GPLv2+
> Summary:        A System and Service Manager
>@@ -85,6 +85,9 @@ Source4:        listen.conf
> # Prevent accidental removal of the systemd package
> Source6:        yum-protect-systemd.conf
> 
>+# Avoid kernel timewarp being carried out twice
>+Patch0:         systemd-195-no_timewarp_in_initrd.patch
>+
> Obsoletes:      SysVinit < 2.86-24, sysvinit < 2.86-24
> Provides:       SysVinit = 2.86-24, sysvinit = 2.86-24
> Provides:       sysvinit-userspace
>@@ -192,6 +195,7 @@ glib-based applications using libudev functionality.
> 
> %prep
> %setup -q %{?gitcommit:-n %{name}-git%{gitcommit}}
>+%patch0 -p1 -b .no_timewarp_in_initrd
> 
> %build
> %{?gitcommit: ./autogen.sh }
>@@ -703,6 +707,10 @@ fi
> %{_libdir}/pkgconfig/gudev-1.0*
> 
> %changelog
>+* Thu Nov  1 2012 Michel Salim <salimma@fedoraproject.org> - 195-6
>+- make sure the kernel localtime adjustment is carried out only once
>+- https://bugzilla.redhat.com/show_bug.cgi?id=870535
>+
> * Thu Oct 25 2012 Kay Sievers <kay@redhat.com> - 195-5
> - require 'sed', limit HOSTNAME= match
> 
>-- 
>1.7.12.1
>

Actions: View | Diff

Attachments on bug 870535: 634008 | 636748