[PATCH] x86: "make isoimage" support; FDINITRD= support; minor cleanups

Add a "make isoimage" to i386 and x86-64, which allows the automatic
creation of a bootable CD image.  It also adds an option FDINITRD= to
include an initrd of the user's choice in generated floppy- or CD boot
images.  Finally, some minor cleanups of the image generation code.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Andi Kleen <ak@muc.de>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 32 insertions, 4 deletions

diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile
index f136752563b1..33e55476381b 100644
--- a/arch/i386/boot/Makefile
+++ b/arch/i386/boot/Makefile
@@ -62,8 +62,12 @@ $(obj)/setup $(obj)/bootsect: %: %.o FORCE
 $(obj)/compressed/vmlinux: FORCE
         $(Q)$(MAKE) $(build)=$(obj)/compressed IMAGE_OFFSET=$(IMAGE_OFFSET) $@
 
-# Set this if you want to pass append arguments to the zdisk/fdimage kernel
+# Set this if you want to pass append arguments to the zdisk/fdimage/isoimage kernel
 FDARGS = 
+# Set this if you want an initrd included with the zdisk/fdimage/isoimage kernel
+FDINITRD =
+
+image_cmdline = default linux $(FDARGS) $(if $(FDINITRD),initrd=initrd.img,)
 
 $(obj)/mtools.conf: $(src)/mtools.conf.in
         sed -e 's|@OBJ@|$(obj)|g' < $< > $@
@@ -72,8 +76,11 @@ $(obj)/mtools.conf: $(src)/mtools.conf.in
 zdisk: $(BOOTIMAGE) $(obj)/mtools.conf
         MTOOLSRC=$(obj)/mtools.conf mformat a:                  ; sync
         syslinux /dev/fd0                                       ; sync
-        echo 'default linux $(FDARGS)' | \
+        echo '$(image_cmdline)' | \
                 MTOOLSRC=$(src)/mtools.conf mcopy - a:syslinux.cfg
+        if [ -f '$(FDINITRD)' ] ; then \
+                MTOOLSRC=$(obj)/mtools.conf mcopy '$(FDINITRD)' a:initrd.img ; \
+        fi
         MTOOLSRC=$(obj)/mtools.conf mcopy $(BOOTIMAGE) a:linux  ; sync
 
 # These require being root or having syslinux 2.02 or higher installed
@@ -81,18 +88,39 @@ fdimage fdimage144: $(BOOTIMAGE) $(obj)/mtools.conf
         dd if=/dev/zero of=$(obj)/fdimage bs=1024 count=1440
         MTOOLSRC=$(obj)/mtools.conf mformat v:                  ; sync
         syslinux $(obj)/fdimage                                 ; sync
-        echo 'default linux $(FDARGS)' | \
+        echo '$(image_cmdline)' | \
                 MTOOLSRC=$(obj)/mtools.conf mcopy - v:syslinux.cfg
+        if [ -f '$(FDINITRD)' ] ; then \
+                MTOOLSRC=$(obj)/mtools.conf mcopy '$(FDINITRD)' v:initrd.img ; \
+        fi
         MTOOLSRC=$(obj)/mtools.conf mcopy $(BOOTIMAGE) v:linux  ; sync
 
 fdimage288: $(BOOTIMAGE) $(obj)/mtools.conf
         dd if=/dev/zero of=$(obj)/fdimage bs=1024 count=2880
         MTOOLSRC=$(obj)/mtools.conf mformat w:                  ; sync
         syslinux $(obj)/fdimage                                 ; sync
-        echo 'default linux $(FDARGS)' | \
+        echo '$(image_cmdline)' | \
                 MTOOLSRC=$(obj)/mtools.conf mcopy - w:syslinux.cfg
+        if [ -f '$(FDINITRD)' ] ; then \
+                MTOOLSRC=$(obj)/mtools.conf mcopy '$(FDINITRD)' w:initrd.img ; \
+        fi
         MTOOLSRC=$(obj)/mtools.conf mcopy $(BOOTIMAGE) w:linux  ; sync
 
+isoimage: $(BOOTIMAGE)
+        -rm -rf $(obj)/isoimage
+        mkdir $(obj)/isoimage
+        cp `echo /usr/lib*/syslinux/isolinux.bin | awk '{ print $1; }'` \
+                $(obj)/isoimage
+        cp $(BOOTIMAGE) $(obj)/isoimage/linux
+        echo '$(image_cmdline)' > $(obj)/isoimage/isolinux.cfg
+        if [ -f '$(FDINITRD)' ] ; then \
+                cp '$(FDINITRD)' $(obj)/isoimage/initrd.img ; \
+        fi
+        mkisofs -J -r -o $(obj)/image.iso -b isolinux.bin -c boot.cat \
+                -no-emul-boot -boot-load-size 4 -boot-info-table \
+                $(obj)/isoimage
+        rm -rf $(obj)/isoimage
+
 zlilo: $(BOOTIMAGE)
         if [ -f $(INSTALL_PATH)/vmlinuz ]; then mv $(INSTALL_PATH)/vmlinuz $(INSTALL_PATH)/vmlinuz.old; fi
         if [ -f $(INSTALL_PATH)/System.map ]; then mv $(INSTALL_PATH)/System.map $(INSTALL_PATH)/System.old; fi