From: Marty Connor <mdc@etherboot.org>
Date: Fri, 6 Jul 2007 12:04:55 +0000 (-0400)
Subject: Merge branch 'master' of /pub/scm/gpxe
X-Git-Tag: v0.9.3~280^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74a1c77820629a7843b0ea3f7d29fc43824765a2;p=thirdparty%2Fipxe.git

Merge branch 'master' of /pub/scm/gpxe
---

74a1c77820629a7843b0ea3f7d29fc43824765a2
diff --cc src/arch/i386/Makefile
index bda22c8af,21a8e36d7..620cddd2d
--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@@ -111,9 -111,15 +111,15 @@@ NON_AUTO_MEDIA		+= fd
  	dd if=$< bs=512 conv=sync of=/dev/fd0
  	sync
  
+ # rule to create padded disk images
+ NON_AUTO_MEDIA		+= pdsk
+ %pdsk : %dsk
+ 	cp $< $@
+ 	$(PERL) ./util/dskpad.pl $@
+ 
  # rule to make a non-emulation ISO boot image
  NON_AUTO_MEDIA		+= iso
 -%iso:	%lilo util/geniso
 +%iso:	%lkrn util/geniso
  	ISOLINUX_BIN=$(ISOLINUX_BIN) bash util/geniso $@ $<
  
  # rule to make a floppy emulation ISO boot image