[patch] New patch - compatible with baselayout-1 and baselayout-2

adjtimex-1.29-gentoo-utc-baselayout2compatible.patch (text/plain), 1.03 KB, created by Tomasz Wasiak on 2011-12-23 20:42:46 UTC

--- 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}'`