diff options
| author | Bill Nottingham <notting@redhat.com> | 2007-10-04 15:24:32 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2007-10-04 15:24:32 +0000 |
| commit | 35b965fc7c9afd05515869345eb44f2b851fdd00 (patch) | |
| tree | b1c7ebe7f865138e18b39340b44e50bdea842fb8 | |
| parent | a963d4d727a744e10ed6bf9291803abc6f92a3a4 (diff) | |
| download | initscripts-35b965fc7c9afd05515869345eb44f2b851fdd00.tar initscripts-35b965fc7c9afd05515869345eb44f2b851fdd00.tar.gz initscripts-35b965fc7c9afd05515869345eb44f2b851fdd00.tar.bz2 initscripts-35b965fc7c9afd05515869345eb44f2b851fdd00.tar.xz initscripts-35b965fc7c9afd05515869345eb44f2b851fdd00.zip | |
revert conflict so that xen can work
| -rw-r--r-- | initscripts.spec | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/initscripts.spec b/initscripts.spec index 855186a2..c747124b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -18,7 +18,7 @@ Requires: /etc/redhat-release, dev Requires: ethtool >= 1.8-2, /sbin/runuser Requires: udev >= 078-1 Requires: popt >= 1.12-2 -Conflicts: mkinitrd < 4.0, kernel < 2.6.23 +Conflicts: mkinitrd < 4.0, kernel < 2.6.12 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 @@ -208,6 +208,8 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +- revert kernel conflict so that xen can still work + * Tue Sep 25 2007 Bill Nottingham <notting@redhat.com> - 8.57-1 - work around upstream bash changes (#220887, modified from <nvigier@mandriva.com>) - init.d/network: add Should-Start for firewall services |