From 4dfbb4fd4c82e22720eb8554ea84e14864762202 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Tue, 12 Oct 2004 19:30:08 +0000 Subject: 2004-10-12 Jeremy Katz * scripts/mk-images.x86_64: * scripts/mk-images.i386: Remove localboot option from syslinux.cfg for diskboot.img (#135263) --- scripts/mk-images.i386 | 3 ++- scripts/mk-images.x86_64 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts') 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 -- cgit