summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2005-03-28 15:44:40 +0000
committerPeter Jones <pjones@redhat.com>2005-03-28 15:44:40 +0000
commita61a425015a06f731a62ae8830c386afa4e91388 (patch)
tree9eb8d47390987785b892aeb877688200bc57f3e9
parent9f79580e6649590df7f09cd6ee34df744d07817e (diff)
downloadanaconda-a61a425015a06f731a62ae8830c386afa4e91388.tar.gz
anaconda-a61a425015a06f731a62ae8830c386afa4e91388.tar.xz
anaconda-a61a425015a06f731a62ae8830c386afa4e91388.zip
adjust for in-kernel ds in mk-images, too
-rw-r--r--ChangeLog2
-rw-r--r--scripts/mk-images.i3862
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 41b58cfc1..176a1d95a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
* loader2/pcmciatest.c: same as above, plus some gcc4 fixes
+ * scripts/mk-images.i386: don't load "ds", do load "pcmcia"
+
2005-03-25 Bill Nottingham <notting@redhat.com>
* anaconda.spec: Bump version.
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index 24c58e6ee..5090cc3f6 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -111,7 +111,7 @@ done
BOOTPCMCIAMODULES=`echo $PCMCIAMODULES | eval "$PCMCIAMODULES_EXCLUDED_SED"`
# need to make sure the base modules are included
-BOOTPCMCIAMODULES="$BOOTPCMCIAMODULES yenta_socket i82365 tcic pcmcia_core ds"
+BOOTPCMCIAMODULES="$BOOTPCMCIAMODULES yenta_socket i82365 tcic pcmcia_core pcmcia"
makeBootImages() {
if [ "$KERNELARCH" = "i386" ]; then