summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2004-05-05 19:36:03 +0000
committerJeremy Katz <katzj@redhat.com>2004-05-05 19:36:03 +0000
commit352fe0c08ba6b6498ea0991051bf42994ca169d0 (patch)
tree9b4e0aa561d03c2e75737fb4ce4f9d2e107638db
parent5ab1175ab5018a12d5ffa07e52e380efa4fc36e4 (diff)
downloadanaconda-352fe0c08ba6b6498ea0991051bf42994ca169d0.tar.gz
anaconda-352fe0c08ba6b6498ea0991051bf42994ca169d0.tar.xz
anaconda-352fe0c08ba6b6498ea0991051bf42994ca169d0.zip
veth is now iseries_veth
-rw-r--r--loader2/hardware.c2
-rw-r--r--loader2/module-info4
-rw-r--r--scripts/mk-images.ppc2
3 files changed, 6 insertions, 2 deletions
diff --git a/loader2/hardware.c b/loader2/hardware.c
index e3fce9273..6597b5d56 100644
--- a/loader2/hardware.c
+++ b/loader2/hardware.c
@@ -211,7 +211,7 @@ int probeiSeries(moduleInfoSet modInfo, moduleList modLoaded,
/* this is a hack since we can't really probe on iSeries */
#ifdef __powerpc__
if (!access("/proc/iSeries", X_OK)) {
- mlLoadModuleSet("veth:viodasd:viocd", modLoaded, modDeps, modInfo, flags);
+ mlLoadModuleSet("iseries_veth:veth:viodasd:viocd", modLoaded, modDeps, modInfo, flags);
}
#endif
return 0;
diff --git a/loader2/module-info b/loader2/module-info
index cbe9f0d21..afd8d0ebc 100644
--- a/loader2/module-info
+++ b/loader2/module-info
@@ -540,6 +540,10 @@ veth
eth
"iSeries Virtual Ethernet"
+iseries_veth
+ eth
+ "iSeries Virtual Ethernet"
+
viodasd
scsi_hostadapter
"iSeries Virtual DASD"
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc
index f09eceea0..22b0500c5 100644
--- a/scripts/mk-images.ppc
+++ b/scripts/mk-images.ppc
@@ -9,7 +9,7 @@ NETMODULES="sungem tg3 ne2k-pci 3c59x 8139too olympic
de4x5 acenic pcnet32 tulip natsemi e100 e1000 airport"
SCSIMODULES="$SCSIMODS advansys aic7xxx initio sym53c8xx ipr"
-ISERIESMODULES="veth viodasd viocd ipr"
+ISERIESMODULES="iseries_veth veth viodasd viocd ipr"
# images we only want on the CD (usually for space reasons)
ISOMODULES="ehci-hcd ieee1394 ohci1394 sbp2"