Hello community, here is the log from the commit of package aaa_base checked in at Wed Dec 12 17:56:35 CET 2007. -------- --- aaa_base/aaa_base.changes 2007-12-10 17:17:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2007-12-12 17:19:02.641507000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 12 17:18:51 CET 2007 - werner@suse.de + +- Adjust file for hwclock<->sysclock only on UTC hwclock (#223365) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.l22286/_old 2007-12-12 17:54:51.000000000 +0100 +++ /var/tmp/diff_new_pack.l22286/_new 2007-12-12 17:54:51.000000000 +0100 @@ -19,7 +19,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools AutoReqProv: on Version: 11.0 -Release: 6 +Release: 7 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -134,6 +134,8 @@ %defattr(-,root,root) %changelog +* Wed Dec 12 2007 - werner@suse.de +- Adjust file for hwclock<->sysclock only on UTC hwclock (#223365) * Mon Dec 10 2007 - ro@suse.de - moved /etc/skel/.inputrc and /etc/skel/.emacs from aaa_skel to here ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.clock new/aaa_base/etc/init.d/boot.clock --- old/aaa_base/etc/init.d/boot.clock 2007-06-20 11:58:10.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.clock 2007-12-12 17:27:52.000000000 +0100 @@ -16,6 +16,14 @@ . /etc/rc.status . /etc/sysconfig/clock + +# +# Don't run into trouble due daylight-saving time +# +case "$HWCLOCK" in +*-l*) HWCLOCK="$HWCLOCK --noadjfile" +esac + rc_reset case "$1" in @@ -70,28 +78,26 @@ else echo -n Setting up the hardware clock - + # + # Read out to hardware clock and for UTC calculate adjtime + # write back the system time later at reboot/shutdown time. + # if test "$SYSTOHC" = "yes" ; then # - # We write back the system time later at - # reboot/shutdown time. + # For UTC calculate adjtime # - if test ! -f /etc/adjtime ; then - echo "0.0 0 0" > /etc/adjtime - echo "0" >> /etc/adjtime - case "$HWCLOCK" in - *-u*) echo "UTC" >> /etc/adjtime ;; - *-l*) echo "LOCAL" >> /etc/adjtime ;; - esac - fi - /sbin/hwclock --adjust $HWCLOCK - rc_status - /sbin/hwclock --hctosys $HWCLOCK - rc_status - else - /sbin/hwclock --hctosys --noadjfile $HWCLOCK + case "$HWCLOCK" in + *-u*) + if test ! -s /etc/adjtime ; then + echo "0.0 0 0.0" > /etc/adjtime + echo "0" >> /etc/adjtime + echo "UTC" >> /etc/adjtime + fi + /sbin/hwclock --adjust $HWCLOCK + rc_status + esac fi - + /sbin/hwclock --hctosys $HWCLOCK rc_status -v -r fi ;; @@ -100,7 +106,7 @@ if test "$SYSTOHC" = "yes" ; then echo -n "Set Hardware Clock to the current System Time" # - # Write back to hardware clock and calculate adjtime + # Write back to hardware clock and for UTC calculate adjtime # /sbin/hwclock --systohc $HWCLOCK rc_status -v -r ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org