diff options
| author | Bill Nottingham <notting@redhat.com> | 2009-09-02 14:06:32 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2009-09-02 14:06:32 -0400 |
| commit | 7accf38c3bc38bc2664f9549910c7d365d5de303 (patch) | |
| tree | d4ce462a47ce19a1d8da9f43761b28b8eb02f36b | |
| parent | f1e3b00216c354c9bce703d67334bfcef4bb153a (diff) | |
| download | initscripts-7accf38c3bc38bc2664f9549910c7d365d5de303.tar initscripts-7accf38c3bc38bc2664f9549910c7d365d5de303.tar.gz initscripts-7accf38c3bc38bc2664f9549910c7d365d5de303.tar.bz2 initscripts-7accf38c3bc38bc2664f9549910c7d365d5de303.tar.xz initscripts-7accf38c3bc38bc2664f9549910c7d365d5de303.zip | |
Use --systz instead of --hctosys. (#517886, #489494)
Also, require a new enough kernel that sets the clock, and a new enough
util-linux that implements --systz.
| -rw-r--r-- | initscripts.spec | 4 | ||||
| -rw-r--r-- | udev/rules.d/88-clock.rules | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/initscripts.spec b/initscripts.spec index b2e503a2..b769f686 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -15,7 +15,7 @@ Requires: /sbin/sysctl, syslog Requires: /sbin/fuser, /bin/grep Requires: /sbin/pidof, /sbin/blkid Requires: module-init-tools -Requires: util-linux >= 2.10s-11, mount >= 2.11l +Requires: util-linux-ng >= 2.16, mount >= 2.11l Requires: bash >= 3.0 %if with_upstart Requires: upstart @@ -28,7 +28,7 @@ Requires: ethtool >= 1.8-2, /sbin/runuser Requires: udev >= 125-1 Requires: popt >= 1.12-2 Requires: cpio -Conflicts: mkinitrd < 4.0, kernel < 2.6.12, mdadm < 2.6.4-3 +Conflicts: mkinitrd < 4.0, kernel < 2.6.31, mdadm < 2.6.4-3 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Conflicts: dhclient < 3.0.3-7 Conflicts: tcsh < 6.13-5 diff --git a/udev/rules.d/88-clock.rules b/udev/rules.d/88-clock.rules index 4b574163..831c7ac5 100644 --- a/udev/rules.d/88-clock.rules +++ b/udev/rules.d/88-clock.rules @@ -1,2 +1,2 @@ -ACTION=="add", SUBSYSTEM=="rtc", RUN+="/sbin/hwclock --hctosys --rtc=/dev/%k" -ACTION=="add", ENV{MAJOR}=="10", ENV{MINOR}=="135", RUN+="/sbin/hwclock --hctosys --rtc=/dev/%k" +ACTION=="add", SUBSYSTEM=="rtc", RUN+="/sbin/hwclock --systz --rtc=/dev/%k" +ACTION=="add", ENV{MAJOR}=="10", ENV{MINOR}=="135", RUN+="/sbin/hwclock --systz --rtc=/dev/%k" |