summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2002-06-18 04:44:59 +0000
committerJeremy Katz <katzj@redhat.com>2002-06-18 04:44:59 +0000
commit806fa8ce06c3274a0ecf7a98a4d9e0188496676a (patch)
treea56ad5bc068222f5054eb34a35faf93e2eda2f52 /scripts
parenta0d2b37771af23adddba3f7a8e67eeb5e871ad96 (diff)
downloadanaconda-806fa8ce06c3274a0ecf7a98a4d9e0188496676a.tar.gz
anaconda-806fa8ce06c3274a0ecf7a98a4d9e0188496676a.tar.xz
anaconda-806fa8ce06c3274a0ecf7a98a4d9e0188496676a.zip
make an isolinux directory so that we can use isolinux for booting cds
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mk-images.i38621
-rwxr-xr-xscripts/upd-instroot1
2 files changed, 22 insertions, 0 deletions
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index 2cc60adf0..0b8912bf6 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -11,6 +11,12 @@ prepareBootImage() {
$SYSLINUX $MBD_TMPIMAGE
mount -o loop -t msdos $MBD_TMPIMAGE $MBD_BOOTTREE
+ prepareBootTree
+}
+
+# prepare a directory with the kernel, initrd, and various message files
+# used to populate a boot image
+prepareBootTree() {
(cd $BOOTDISKDIR; find . ! -name "*.msg" -maxdepth 1 ! -type d | cpio --quiet -p $MBD_BOOTTREE)
cp $MBD_FSIMAGE $MBD_BOOTTREE/initrd.img
@@ -209,6 +215,21 @@ makeinitrd --initrdto $TOPDESTPATH/images/pxeboot/initrd-everything.img \
--modules "$LOCALMODULES $NETWORKMODULES $PCMCIAMAINMODULES $PCMCIAMODULES =scsi =net"
[ $? = 0 ] || exit 1
+if [ -f $IMGPATH/usr/lib/syslinux/isolinux.bin ]; then
+ echo "Building isolinux directory"
+ MBD_BOOTTREE=$TOPDESTPATH/isolinux
+ MBD_FSIMAGE=$TOPDESTPATH/images/pxeboot/initrd-everything.
+ mkdir $MBD_BOOTTREE
+ cp $IMGPATH/usr/lib/syslinux/isolinux.bin $MBD_BOOTTREE/isolinux.bin
+
+ prepareBootTree
+
+ # isolinux needs the config file to be isolinux.cfg
+ mv $BOOTTREE/syslinux.cfg $BOOTTREE/isolinux.cfg
+else
+ echo "No isolinux binaries. Skipping isolinux creation"
+fi
+
echo "Building main moduleball"
makemainmodules "=scsi =net $SECSTAGE"
[ $? = 0 ] || exit 1
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 3d7e1c3ea..5d9626859 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -592,6 +592,7 @@ usr/lib/libvte*
usr/lib/locale/*
usr/lib/pango/*
usr/lib/rpm/rpmpopt
+usr/lib/syslinux/*
usr/sbin/chroot
usr/sbin/ddcprobe
usr/sbin/gnome-pty-helper