summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2004-10-12 19:30:08 +0000
committerJeremy Katz <katzj@redhat.com>2004-10-12 19:30:08 +0000
commit4dfbb4fd4c82e22720eb8554ea84e14864762202 (patch)
tree7ef6d4f3885f43dca33ee4da56584e68941543ee /scripts
parent2ef471726416fa3ac52e85a38eeb7930b0638094 (diff)
2004-10-12 Jeremy Katz <katzj@redhat.com>
* scripts/mk-images.x86_64: * scripts/mk-images.i386: Remove localboot option from syslinux.cfg for diskboot.img (#135263)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mk-images.i3863
-rw-r--r--scripts/mk-images.x86_643
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index 3cc16e842..24c58e6ee 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -197,7 +197,8 @@ makeBootImages() {
$SYSLINUX $TOPDESTPATH/images/diskboot.img
mount -o loop $TOPDESTPATH/images/diskboot.img $TOPDESTPATH/images/fobpath
cp -r $TOPDESTPATH/isolinux/* $TOPDESTPATH/images/fobpath/
- mv $TOPDESTPATH/images/fobpath/isolinux.cfg $TOPDESTPATH/images/fobpath/syslinux.cfg
+ grep -v local $TOPDESTPATH/images/fobpath/isolinux.cfg > $TOPDESTPATH/images/fobpath/syslinux.cfg
+ rm -f $TOPDESTPATH/images/fobpath/isolinux.cfg
umount -f $TOPDESTPATH/images/fobpath
rmdir $TOPDESTPATH/images/fobpath
diff --git a/scripts/mk-images.x86_64 b/scripts/mk-images.x86_64
index aafbbb635..bb9383690 100644
--- a/scripts/mk-images.x86_64
+++ b/scripts/mk-images.x86_64
@@ -139,7 +139,8 @@ makeBootImages() {
$SYSLINUX $TOPDESTPATH/images/diskboot.img
mount -o loop $TOPDESTPATH/images/diskboot.img $TOPDESTPATH/images/fobpath
cp -r $TOPDESTPATH/isolinux/* $TOPDESTPATH/images/fobpath/
- mv $TOPDESTPATH/images/fobpath/isolinux.cfg $TOPDESTPATH/images/fobpath/syslinux.cfg
+ grep -v local $TOPDESTPATH/images/fobpath/isolinux.cfg > $TOPDESTPATH/images/fobpath/syslinux.cfg
+ rm -f $TOPDESTPATH/images/fobpath/isolinux.cfg
umount -f $TOPDESTPATH/images/fobpath
rmdir $TOPDESTPATH/images/fobpath