Hello LaMont,
On Saturday, September 22, 2007 at 9:21:17 -0600, LaMont Jones wrote:
> http://incoming.debian.org/util-linux_2.13-7_i386.deb for starters,
> source is there too. After today's dinstall run (2:50ish ET), it'll
> be in the archive for sid. If I didn't fix the bug, please let me
> know which case I missed...
There are 3 minor problems in hwclock.sh 2.13-7:
-1) The README.Debian.hwclock ".gz" extension lacks in comments (the
return of the revenge of the recently closed bug #393539).
-2) If /etc/adjtime is not writable, the --noadjfile option will be
added to hwclock. This --noadjfile will force --hctosys to ignore an
existing /etc/adjtime, it will then be unable to compensate past drift,
and will set a wrong system time (corrected only later at S11).
The goal here is to use --noadjfile when /etc/adjtime does not exist and
can't be created, not when it is readable. I'd propose to change the
test to [ ! -r /etc/adjtime ].
-3) If the --hctosys call requires $HWCLOCKPARS (perhaps --directisa),
the --adjust call most probably requires it also.
The attached patch should fix those 3 quirks, and add a short comment
about where to set --directisa when necessary (helps bugs #435102 and
#439593).
Alain.
fixes 3 minor quirks in hwclock.sh 2.13-7
see Debian bug #443487
Signed-off-by: Alain Guibert <[EMAIL PROTECTED]>
--- ulng-7/debian/hwclock.sh.orig Tue Sep 25 13:37:30 2007
+++ ulng-7/debian/hwclock.sh Tue Sep 25 14:20:29 2007
@@ -12,7 +12,7 @@
# - Added comments to alert users of hwclock issues
# and discourage tampering without proper doc reading.
-# WARNING: Please read /usr/share/doc/util-linux/README.Debian.hwclock
+# WARNING: Please read /usr/share/doc/util-linux/README.Debian.hwclock.gz
# or /usr/share/doc/util-linux/README.Debian.hwclock
# before changing this file. You risk serious clock
# misbehaviour otherwise.
@@ -28,7 +28,8 @@
FIRST=no # debian/rules sets this to 'yes' when creating hwclockfirst.sh
# Set this to any options you might need to give to hwclock, such
-# as machine hardware clock type for Alphas.
+# as machine hardware clock type for Alphas, or --directisa direct
+# access option for machines without proper RTC interrupt.
HWCLOCKPARS=
hwclocksh()
@@ -68,7 +69,7 @@ hwclocksh()
echo "0.0 0 0.0" > /etc/adjtime
fi
- if [ ! -w /etc/adjtime ]; then
+ if [ ! -r /etc/adjtime ]; then
NOADJ="--noadjfile"
else
NOADJ=""
@@ -92,10 +93,10 @@ hwclocksh()
# to a very different value and hwclock --adjust is being
# used.
#
- # Please read /usr/share/doc/util-linux/README.Debian.hwclock
+ # Please read /usr/share/doc/util-linux/README.Debian.hwclock.gz
# before enablig hwclock --adjust.
- #hwclock --adjust $GMT $BADYEAR
+ #hwclock --adjust $GMT $HWCLOCKPARS $BADYEAR
:
fi
