Mailinglist Archive: opensuse-commit (1023 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package aaa_base for openSUSE:Factory
checked in at Wed Nov 3 16:16:09 CET 2010.



--------
--- aaa_base/aaa_base.changes   2010-10-22 01:41:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes      2010-11-03 
11:24:03.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov  3 11:22:34 CET 2010 - werner@xxxxxxx
+
+- Do not remove /etc/adjtime but simply correct the third line
+  for applications depending on CMOS time (bnc#650719)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ aaa_base.spec ++++++
--- /var/tmp/diff_new_pack.aDKeYt/_old  2010-11-03 16:15:14.000000000 +0100
+++ /var/tmp/diff_new_pack.aDKeYt/_new  2010-11-03 16:15:14.000000000 +0100
@@ -20,7 +20,7 @@
 
 Name:           aaa_base
 Version:        11.4
-Release:        7
+Release:        8
 License:        GPLv2+
 Group:          System/Fhs
 Provides:       bin bootutls etc skeleng skelger 

++++++ 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  2010-02-23 17:24:51.000000000 +0100
+++ new/aaa_base/etc/init.d/boot.clock  2010-11-03 11:17:22.000000000 +0100
@@ -91,6 +91,14 @@
     fi
 }
 
+adjfile_thirdline()
+{
+    case "$HWCLOCK" in
+    *-u*) grep -q LOCAL /etc/adjtime && sed -ir 's/LOCAL/UTC/' /etc/adjtime ;;
+    *-l*) grep -q UTC   /etc/adjtime && sed -ir 's/UTC/LOCAL/' /etc/adjtime ;;
+    esac 2> /dev/null
+}
+
 rc_reset
 
 case "$1" in
@@ -142,11 +150,13 @@
                        echo "0"
                        echo "UTC"
                } > /etc/adjtime
+           else
+               test -w /etc/adjtime && adjfile_thirdline
            fi
            rtc_rule /sbin/hwclock $HWCLOCK --adjust
        else
-           # Remove any /etc/adjtime left over
-           test -e /etc/adjtime && rm -f /etc/adjtime
+           # Change any /etc/adjtime left over
+           test -w /etc/adjtime && adjfile_thirdline
            SYSTZ="--systz"
             test -e /dev/shm/warpclock && SYSTZ=""
            rtc_rule /sbin/hwclock $SYSTZ $HWCLOCK --noadjfile
@@ -167,8 +177,8 @@
            if test "$USE_ADJFILE" = yes ; then
                /sbin/hwclock --systohc $HWCLOCK
            else
-               # Remove any /etc/adjtime left over
-               test -e /etc/adjtime && rm -f /etc/adjtime
+               # Change any /etc/adjtime left over
+               test -w /etc/adjtime && adjfile_thirdline
                /sbin/hwclock --systohc $HWCLOCK --noadjfile
            fi
            rc_status -v


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx