The no-interrupts-fallback seems to do the trick:

thecus:~/debsrc/adjtimex-1.23#/adjtimex --compare=1 --verbose
opened /dev/rtc for reading
/dev/rtc doesn't allow user access to update interrupts
 - using busy wait instead
waiting for CMOS time change
CMOS time Mon Mar 24 11:27:33 2008
 (assuming local time) = 1206354453
adjusting CMOS times by 1 hour
                                      --- current ---   -- suggested --
cmos time     system-cmos  error_ppm   tick      freq    tick      freq
1206358058       1.431067


However, I could not try the rtc0-fallback, as the patch failed to
apply. Maybe I got the wrong order of applying. But as the no-interrupts
makes it working, IMHO this could be packaged for a release fit for
lenny.

I got the patches from #460065, and tried to patch the debian sources
(1.23) in that order:
no-interrupt-fallback.patch
no-interrupt-fallback-3.patch
rtc0_fallback.patch

2nd try:
no-interrupt-fallback.patch
rtc0_fallback.patch
no-interrupt-fallback-3.patch

result the same: the rtc0_fallback fails to apply.

thecus:~/debsrc/adjtimex-1.23# cat ../no-interrupt-fallback.patch |
patch 
patching file adjtimex.c
Hunk #3 succeeded at 507 (offset -11 lines).
Hunk #4 succeeded at 521 (offset -11 lines).
Hunk #5 succeeded at 552 (offset -11 lines).
Hunk #6 succeeded at 622 (offset -11 lines).
Hunk #7 succeeded at 775 (offset -11 lines).
thecus:~/debsrc/adjtimex-1.23# cat ../no-interrupt-fallback-3.patch |
patch 
patching file adjtimex.c
Hunk #1 succeeded at 156 (offset -1 lines).
Hunk #2 succeeded at 622 (offset -31 lines).
Hunk #3 succeeded at 811 (offset -31 lines).
thecus:~/debsrc/adjtimex-1.23# cat ../rtc0_fallback.patch | patch 
patching file adjtimex.c
Hunk #1 succeeded at 61 with fuzz 2.
Hunk #2 succeeded at 531 (offset -11 lines).
Hunk #3 FAILED at 541.
Hunk #4 FAILED at 650.
Hunk #5 FAILED at 672.
3 out of 5 hunks FAILED -- saving rejects to file adjtimex.c.rej



On Sat, 2008-03-22 at 15:37 +0100, Alain Guibert wrote:
> I think that adjtimex should then automatically fallback to /dev/rtc0,
> so it works even without symlink. Hwclock does that. The attached
> rtc0_fallback.patch should do it. This patch must be applied after
> no-interrupt-fallback.patch.
> 
> 
> Alain.

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to