Hello community, here is the log from the commit of package mkinitrd for openSUSE:12.2 checked in at 2012-07-04 22:21:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/mkinitrd (Old) and /work/SRC/openSUSE:12.2/.mkinitrd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkinitrd", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.2/mkinitrd/mkinitrd.changes 2012-06-25 15:46:21.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.mkinitrd.new/mkinitrd.changes 2012-07-04 22:21:25.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 4 14:43:05 UTC 2012 - [email protected] + +- Fix boot clock scriptlet by testing /etc/adjtime before + /etc/sysconfig/clock to make sure that warpclock is executed + if CMOS clock is in local time + +------------------------------------------------------------------- New: ---- mkinitrd-2.7.0-adjtime.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.VQmuS7/_old 2012-07-04 22:21:25.000000000 +0200 +++ /var/tmp/diff_new_pack.VQmuS7/_new 2012-07-04 22:21:25.000000000 +0200 @@ -47,6 +47,7 @@ Group: System/Base BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tar.bz2 +Patch0: mkinitrd-2.7.0-adjtime.patch # Note: the whole package is maintained in this git repository, please # don't change it in the build service without sending the author a # pull request or patch first. Otherwise, you risk that your changes will be @@ -81,6 +82,7 @@ %prep %setup +%patch0 -p1 %build %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c ++++++ mkinitrd-2.7.0-adjtime.patch ++++++ >From 5976679fa6f496e2904a6c33c9340fabd061f2d7 Mon Sep 17 00:00:00 2001 From: Werner Fink <[email protected]> Date: Wed, 4 Jul 2012 16:53:10 +0200 Subject: [PATCH] Fix boot clock scriptlet to read /etc/adjtime Fix boot clock scriptlet by testing /etc/adjtime before /etc/sysconfig/clock to make sure that warpclock is executed if CMOS clock is in local time Signed-off-by: Werner Fink <[email protected]> --- scripts/boot-clock.sh | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/scripts/boot-clock.sh b/scripts/boot-clock.sh index 6a9e2dc..990391d 100644 --- a/scripts/boot-clock.sh +++ b/scripts/boot-clock.sh @@ -5,21 +5,23 @@ #%provides: clock #%dontshow -if test -e /etc/sysconfig/clock -a -e /etc/localtime +if test -e /etc/localtime then - . /etc/sysconfig/clock - case "$HWCLOCK" in - *-l*) /bin/warpclock - > /dev/shm/warpclock - esac -elif test -e /etc/adjtime -a -e /etc/localtime -then - while read line - do - if test "$line" = LOCAL - then - /bin/warpclock - > /dev/shm/warpclock - fi - done < /etc/adjtime + if test -e /etc/adjtime + then + while read line + do if test "$line" = LOCAL + then + /bin/warpclock + > /dev/shm/warpclock + fi + done < /etc/adjtime + elif test -e /etc/sysconfig/clock + then + . /etc/sysconfig/clock + case "$HWCLOCK" in + *-l*) /bin/warpclock + > /dev/shm/warpclock + esac + fi fi -- 1.7.9.2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
