From 693f2ea0b85b9eed54bbf64b44597f3ff11c3ad3 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Mon, 30 Nov 2009 14:30:57 -0800
Subject: More removal of old bootloader support

Only support syslinux now. Grub and other things can still
be managed manually by running mkisofs manually.

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 archiso/mkarchiso | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index a0c21d3..099e126 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -29,7 +29,7 @@ usage ()
     echo "   create <dir>"
     echo "      create a base directory layout to work with"
     echo "      includes all specified packages"
-    echo "   iso -p <bootloader> <dir> <image name>"
+    echo "   iso <dir> <image name>"
     echo "      build an iso image from the working dir"
     exit $1
 }
@@ -232,24 +232,12 @@ _imgcommon () {
 command_iso () {
     _imgcommon
 
-    bootflags=""
-    if [ "$PKGLIST" = "syslinux" ]; then
-        if [ ! -e "${work_dir}/iso/boot/isolinux/isolinux.bin" ]; then
-            echo "error: isolinux bin file not found in '${work_dir}/iso/boot/isolinux'"
-            exit 1
-        fi
-        bootflags="-b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat"
-    else
-        echo "No bootloader specified. Use the -p flag to specify"
-        echo "  Supported Bootloaders:"
-        echo "     syslinux"
-        exit 1
-    fi
-
     echo "Creating ISO image..."
     qflag=""
     [ "${QUIET}" = "y" ] && qflag="-quiet"
-    mkisofs ${qflag} -r -l $bootflags -uid 0 -gid 0 \
+    mkisofs ${qflag} -r -l \
+        -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat \
+        -uid 0 -gid 0 \
     	-udf -allow-limited-size -iso-level 3 \
         -input-charset utf-8 -p "prepared by mkarchiso" \
         -no-emul-boot -boot-load-size 4 -boot-info-table \
-- 
cgit v1.2.3-54-g00ecf