summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-11-20 21:30:14 +0000
committerJeremy Katz <katzj@redhat.com>2006-11-20 21:30:14 +0000
commitaab25efc10d839f5771c92c2c9e3a05d6d9fb962 (patch)
treed5bc76a70eff087ea6334f9f5c2c23c01c24c79a
parent40db52ebaaaedccc6cec92b8eda148359c7df1e3 (diff)
downloadanaconda-aab25efc10d839f5771c92c2c9e3a05d6d9fb962.tar.gz
anaconda-aab25efc10d839f5771c92c2c9e3a05d6d9fb962.tar.xz
anaconda-aab25efc10d839f5771c92c2c9e3a05d6d9fb962.zip
2006-11-20 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version * scripts/mk-images.x86_64: xen module fixing * scripts/mk-images.i386: Likewise.
-rw-r--r--ChangeLog4
-rw-r--r--anaconda.spec2
-rw-r--r--scripts/mk-images.i3862
-rw-r--r--scripts/mk-images.x86_642
4 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7382e5847..e43f3dd37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
2006-11-20 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version
+ * scripts/mk-images.x86_64: xen module fixing
+ * scripts/mk-images.i386: Likewise.
+
+ * anaconda.spec: Bump version
* scripts/mk-images.x86_64: More xen -> xenU fixing
* scripts/mk-images.i386: The same
* Makefile: fix build target
diff --git a/anaconda.spec b/anaconda.spec
index 60d1f16ed..d6a028172 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,6 +1,6 @@
ExcludeArch: ppc64
Name: anaconda
-Version: 10.1.1.52
+Version: 10.1.1.52.1
Release: 1
License: GPL
Summary: Graphical system installer
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index cc5188d86..b65b67fe4 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -197,7 +197,7 @@ EOF
makeinitrd --initrdto $TOPDESTPATH/images/xen/initrd.img \
--initrdsize 8192 \
--loaderbin loader \
- --modules "$INITRDMODS"
+ --modules "$LOCALMODULES $NETWORKMODULES $PCMCIAMAINMODULES $BOOTPCMCIAMODULES $PCMCIAMODULES $ISOLINUXMODULES =scsi =net"
[ $? = 0 ] || exit 1
cp $KERNELROOT/boot/vmlinuz-*xen* $TOPDESTPATH/images/xen/vmlinuz
fi
diff --git a/scripts/mk-images.x86_64 b/scripts/mk-images.x86_64
index fd03557ee..cd74cb244 100644
--- a/scripts/mk-images.x86_64
+++ b/scripts/mk-images.x86_64
@@ -159,7 +159,7 @@ EOF
makeinitrd --initrdto $TOPDESTPATH/images/xen/initrd.img \
--initrdsize 8192 \
--loaderbin loader \
- --modules "$INITRDMODS"
+ --modules "$LOCALMODULES $NETWORKMODULES $PCMCIAMAINMODULES $BOOTPCMCIAMODULES $PCMCIAMODULES $ISOLINUXMODULES =scsi =net"
[ $? = 0 ] || exit 1
cp $KERNELROOT/boot/vmlinuz-*xen* $TOPDESTPATH/images/xen/vmlinuz
fi