diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-06-10 04:44:23 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-06-10 04:44:23 +0000 |
| commit | 6331b0b1c0f04ee6239dd188ada033a4dc3d56eb (patch) | |
| tree | 13c9b5db3ec9e0aa885df9f9522f3d79448d5c05 /loader2 | |
| parent | 5946f329b21dba0b77c100196412479e2d2ef5c6 (diff) | |
| download | anaconda-6331b0b1c0f04ee6239dd188ada033a4dc3d56eb.tar.gz anaconda-6331b0b1c0f04ee6239dd188ada033a4dc3d56eb.tar.xz anaconda-6331b0b1c0f04ee6239dd188ada033a4dc3d56eb.zip | |
merge changes from taroon since new rhpl in dist-10 will require them
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/driverselect.c | 2 | ||||
| -rw-r--r-- | loader2/loader.c | 7 | ||||
| -rw-r--r-- | loader2/module-info | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/loader2/driverselect.c b/loader2/driverselect.c index e6c704fc4..f71d85618 100644 --- a/loader2/driverselect.c +++ b/loader2/driverselect.c @@ -159,7 +159,7 @@ 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_CDROM) || (class == CLASS_IDE)) type = DRIVER_SCSI; else if (class == CLASS_UNSPEC) type = -1; diff --git a/loader2/loader.c b/loader2/loader.c index 60c870b6a..5bbd06d98 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -956,6 +956,7 @@ int main(int argc, char ** argv) { struct stat sb; int rc, i; char * arg; + FILE *f; char twelve = 12; char * extraArgs[MAX_EXTRA_ARGS]; @@ -1003,8 +1004,10 @@ int main(int argc, char ** argv) { execl("/bin/sh", "-/bin/sh", NULL); exit(0); } - i = open("/var/run/loader.run", O_CREAT | O_TRUNC | O_RDWR, 0600); - close(i); + + f = fopen("/var/run/loader.run", "w+"); + fprintf(f, "%d\n", getpid()); + fclose(f); /* The fstat checks disallows serial console if we're running through a pty. This is handy for Japanese. */ diff --git a/loader2/module-info b/loader2/module-info index 2795574e9..7bf3b2e06 100644 --- a/loader2/module-info +++ b/loader2/module-info @@ -574,6 +574,10 @@ aic79xx scsi_hostadapter "Adaptec Aic79xx SCSI Host Bus Adapter driver" +ata_piix + scsi_hostadapter + "Intel PIIX/ICH ATA controllers" + atp870u scsi_hostadapter "ACARD ATP870U PCI scsi controller" |