Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2009-11-30 14:30:57 -0800
committerAaron Griffin <aaronmgriffin@gmail.com>2009-11-30 15:14:27 -0800
commit693f2ea0b85b9eed54bbf64b44597f3ff11c3ad3 (patch)
tree2bbf61070f524ee7e05345f61f5163f081bb8160 /archiso
parent7840c984659d29230dc8782d45cfa80682338c79 (diff)
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>
Diffstat (limited to 'archiso')
-rwxr-xr-xarchiso/mkarchiso20
1 files changed, 4 insertions, 16 deletions
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 \