[gentoo-commits] gentoo-x86 commit in net-misc/adjtimex/files: adjtimex-1.29-r1-gentoo-utc.patch

[gentoo-commits] gentoo-x86 commit in net-misc/adjtimex/files: adjtimex-1.29-r1-gentoo-utc.patch

[Robin H. Johnson (robbat2)]

robbat2     13/04/07 00:11:12

  Added:                adjtimex-1.29-r1-gentoo-utc.patch
  Log:
  BL2 support per bug #395839.
  
  (Portage version: 2.2.0_alpha171/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.1                  net-misc/adjtimex/files/adjtimex-1.29-r1-gentoo-utc.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/adjtimex/files/adjtimex-1.29-r1-gentoo-utc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/adjtimex/files/adjtimex-1.29-r1-gentoo-utc.patch?rev=1.1&content-type=text/plain

Index: adjtimex-1.29-r1-gentoo-utc.patch
===================================================================
--- adjtimex-1.29-debian/debian/adjtimexconfig	2011-12-23 21:29:32.962449759 +0100
+++ adjtimex-1.29/debian/adjtimexconfig	2011-12-23 21:30:00.610638657 +0100
@@ -3,6 +3,18 @@
 conffile=/etc/default/adjtimex
 startfile=/etc/init.d/adjtimex
 
+# Get UTC setting
+params=''
+if [ -f /etc/conf.d/clock ]; then
+    #baselayout-1
+    source /etc/conf.d/clock
+    [ "$CLOCK" == "UTC" ] && params='--utc'
+elif [ -f /etc/conf.d/hwclock ]; then
+    #baselayout-2
+    source /etc/conf.d/hwclock
+    [ "$clock" == "UTC" ] && params='--utc'
+fi
+
 echo -n "Comparing clocks (this will take 70 sec)..."
 
 # Get the parameters
@@ -11,7 +23,7 @@
 baseline=`awk '/<= tick/{print ($1+$NF)/2}' /etc/adj.adjust`
 hz=`awk '/USER_HZ/{print $3}' /etc/adj.adjust`
 /usr/sbin/adjtimex  --tick $baseline  --frequency 0
-/usr/sbin/adjtimex  --adjust --force-adjust >/etc/adj.adjust
+/usr/sbin/adjtimex  ${params} --adjust --force-adjust >/etc/adj.adjust
 echo "done."
 ticks=`tail -n 1 /etc/adj.adjust|awk '{print $6}'`
 freq=`tail -n 1 /etc/adj.adjust|awk '{print $7}'`