diff options
| author | Peter Jones <pjones@redhat.com> | 2006-08-09 18:07:41 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2006-08-09 18:07:41 +0000 |
| commit | c5b8981d553a42dfb87242b44484e8c7428b90dc (patch) | |
| tree | 9959d40e84224548514ab4306a54d77952aab05f | |
| parent | ce195954e3aa9c35b43a04b4780ca0de6634a88e (diff) | |
| download | anaconda-c5b8981d553a42dfb87242b44484e8c7428b90dc.tar.gz anaconda-c5b8981d553a42dfb87242b44484e8c7428b90dc.tar.xz anaconda-c5b8981d553a42dfb87242b44484e8c7428b90dc.zip | |
- add support for CLASS_ATA and CLASS_SATA
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | anaconda.spec | 4 | ||||
| -rwxr-xr-x | command-stubs/kudzu-probe-stub | 3 | ||||
| -rw-r--r-- | loader2/driverselect.c | 3 | ||||
| -rw-r--r-- | loader2/hardware.c | 4 |
5 files changed, 22 insertions, 4 deletions
@@ -1,3 +1,15 @@ +2006-08-09 Peter Jones <pjones@redhat.com> + + * command-stubs/kudzu-probe-stub: add SATA probing + + * loader2/driverselect.c (chooseManualDriver): add CLASS_ATA and + CLASS_SATA to the DRIVER_SCSI list. + + * loader2/hardware.c (detectHardware): add CLASS_ATA and CLASS_SATA + to the "nostorage" list. + + * anaconda.spec: depend on newer kudzu + 2006-08-09 Jeremy Katz <katzj@redhat.com> * installclasses/rhel.py (InstallClass.handleRegKey): Add a few diff --git a/anaconda.spec b/anaconda.spec index 986718d33..911c58f8b 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -5,7 +5,7 @@ License: GPL Summary: Graphical system installer Group: Applications/System Source: anaconda-%{PACKAGE_VERSION}.tar.bz2 -BuildPreReq: kudzu-devel >= 1.2.37, pciutils-devel +BuildPreReq: kudzu-devel >= 1.2.42, pciutils-devel BuildPreReq: bzip2-devel, e2fsprogs-devel, python-devel, gtk2-devel BuildPreReq: rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11 BuildPreReq: rhpl, booty, libxml2-python, zlib-devel, elfutils-devel @@ -18,7 +18,7 @@ BuildPreReq: glib2-devel >= 2.11.1-5 BuildPreReq: libdhcp-devel >= 1.10, mkinitrd-devel >= 5.1.2-1 Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, booty Requires: parted >= 1.7.1, pyparted >= 1.7.2 -Requires: kudzu > 1.2.0, yum >= 2.9.2, pirut >= 1.1.0 +Requires: kudzu >= 1.2.42, yum >= 2.9.2, pirut >= 1.1.0 Requires: libxml2-python, python-urlgrabber Requires: system-logos, pykickstart, system-config-date Requires: device-mapper >= 1.01.05-3 diff --git a/command-stubs/kudzu-probe-stub b/command-stubs/kudzu-probe-stub index f122992db..0650e0f59 100755 --- a/command-stubs/kudzu-probe-stub +++ b/command-stubs/kudzu-probe-stub @@ -51,6 +51,9 @@ printResults(doScan(CLASS_NETWORK, BUS_UNSPEC, PROBE_ALL)) print "Scanning for SCSI Controllers" printResults(doScan(CLASS_SCSI, BUS_PCI, PROBE_ALL)) +print "Scanning for SATA Controllers" +printResults(doScan(CLASS_SATA, BUS_PCI, PROBE_ALL)) + print "Scanning for PCMCIA Controllers" printResults(doScan(CLASS_SOCKET, BUS_PCI, PROBE_ALL)) diff --git a/loader2/driverselect.c b/loader2/driverselect.c index 5337e7ba7..fef90aed5 100644 --- a/loader2/driverselect.c +++ b/loader2/driverselect.c @@ -152,7 +152,8 @@ int chooseManualDriver(int class, moduleList modLoaded, if (class == CLASS_NETWORK) type = DRIVER_NET; else if ((class == CLASS_SCSI) || (class == CLASS_HD) || - (class == CLASS_CDROM) || (class == CLASS_IDE)) + (class == CLASS_CDROM) || (class == CLASS_IDE) || + (class == CLASS_ATA) || (class == CLASS_SATA)) type = DRIVER_SCSI; else if (class == CLASS_UNSPEC) type = DRIVER_ANY; diff --git a/loader2/hardware.c b/loader2/hardware.c index 3ecf28bcf..3b5a63569 100644 --- a/loader2/hardware.c +++ b/loader2/hardware.c @@ -107,7 +107,9 @@ static int detectHardware(moduleInfoSet modInfo, char *** modules) { } else if (FL_NOSTORAGE(flags) && (((*device)->type == CLASS_SCSI) || ((*device)->type == CLASS_IDE) || - ((*device)->type == CLASS_RAID))) { + ((*device)->type == CLASS_RAID) || + ((*device)->type == CLASS_ATA) || + ((*device)->type == CLASS_SATA))) { logMessage(DEBUGLVL, "ignoring storage device %s (%s)", (*device)->desc, driver); } else if (FL_NONET(flags) && ((*device)->type == CLASS_NETWORK)) { |