aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2009-09-04 14:23:50 -0400
committerBill Nottingham <notting@redhat.com>2009-09-04 14:23:50 -0400
commit823d66f09aa4d8300dc3001728afa888bbb67aaf (patch)
tree1ab48b3d2f4e060ce371a19463a15037a45af2d9
parent185748891d275ddd92e009799e66e7d08d9eed59 (diff)
downloadinitscripts-823d66f09aa4d8300dc3001728afa888bbb67aaf.tar
initscripts-823d66f09aa4d8300dc3001728afa888bbb67aaf.tar.gz
initscripts-823d66f09aa4d8300dc3001728afa888bbb67aaf.tar.bz2
initscripts-823d66f09aa4d8300dc3001728afa888bbb67aaf.tar.xz
initscripts-823d66f09aa4d8300dc3001728afa888bbb67aaf.zip
Tweak kernel conflict.
We'll be getting a kernel fix that lets us determine whether the kernel set the clock at runtime; relax the conflict in the meantime. 2.6.12 seems low, though.
-rw-r--r--initscripts.spec2
1 files changed, 1 insertions, 1 deletions
diff --git a/initscripts.spec b/initscripts.spec
index ba3c66d1..16f0da5b 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -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.31, mdadm < 2.6.4-3
+Conflicts: mkinitrd < 4.0, kernel < 2.6.18, 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