diff options
author | Gene Cumm <gene.cumm@gmail.com> | 2014-02-01 07:28:19 -0500 |
---|---|---|
committer | Gene Cumm <gene.cumm@gmail.com> | 2014-02-01 07:28:19 -0500 |
commit | 3d70641c998fa051df83b55e51f55ba4ae16ddd6 (patch) | |
tree | 029f6b75fa2b316280c8601206534815ad252db8 | |
parent | 0b5e47ede938e68c694d1f6e68b07a74d93b0ad6 (diff) | |
parent | 1503ab96d07ff9e7120d74ed013216c9d4b1bab8 (diff) | |
download | syslinux-3d70641c998fa051df83b55e51f55ba4ae16ddd6.tar.gz |
Merge branch 'syslinux-4.xx' into syslinux-5.xx
-rw-r--r-- | man/isohybrid.1 | 64 | ||||
-rw-r--r-- | man/memdiskfind.1 | 10 | ||||
-rw-r--r-- | utils/isohybrid.c | 4 |
3 files changed, 76 insertions, 2 deletions
diff --git a/man/isohybrid.1 b/man/isohybrid.1 new file mode 100644 index 00000000..549011b2 --- /dev/null +++ b/man/isohybrid.1 @@ -0,0 +1,64 @@ +.TH isohybrid 1 "17 Jan 2014" "isohybrid" +.SH "NAME" +isohybrid \(em Post-process an ISO 9660 image for booting as a hard disk. +.SH "SYNOPSIS" +.B isohybrid +[\fBOPTIONS\fP] +.I <boot.iso> +.SH "DESCRIPTION" +.PP +The \fBisohybrid\fR utility modifies an ISO 9660 image generated with +mkisofs, genisoimage, or compatible utilities, to be bootable as a CD-ROM or +as a hard disk. +.SH "OPTIONS" +.TP +\fB-h\fR \fI<X>\fR\fN +.br +Number of geometry heads (default 64) +.TP +\fB-s\fR \fI<X>\fR +.br +Number of geometry sectors (default 32) +.TP +\fB-e\fR \fI<X>\fR, \fB--entry\fR \fI<X>\fR +Specify parititon entry number (1-4) +.TP +\fB-o\fR \fI<X>\fR, \fB--offset\fR \fI<X>\fR +.br +Specify partition offset (default 0) +.TP +\fB-t\fR \fI<X>\fR, \fB--type\fR \fI<X>\fR +.br +Specify partition type (default 0x17) +.TP +\fB-i\fR \fI<X>\fR, \fB--id\fR \fI<X>\fR +.br +Specify MBR ID (default random) +.TP +\fB-u\fR, \fB--uefi\fB +Build EFI bootable image +.TP +\fB-m\fR, \fB--mac\fB +Add Apple File Protocol partition table support +.TP +\fB--forcehd0\fR +Assume we are laoded as disk ID 0 +.TP +\fB--ctrlhd0\fR +Assume disk ID 0 if the Ctrl key is pressed +.TP +\fB--partok\fR +Allow booting from within a partition +.TP +\fB-?\fR, \fB--help\fR +Display help +.TP +\fB-v\fR, \fB--verbose\fR +Display verbose output +.TP +\fB-V\fR, \fB--version\fR +Display version information + +.SH "SEE ALSO" +.PP +\fBmkisofs\fR(1) diff --git a/man/memdiskfind.1 b/man/memdiskfind.1 new file mode 100644 index 00000000..f0d677cc --- /dev/null +++ b/man/memdiskfind.1 @@ -0,0 +1,10 @@ +.TH memdiskfind 1 "17 Jan 2014" "memdiskfind" +.SH "NAME" +memdiskfind \(em Simple utility to find a resident \fBmemdisk\fR instance. +.SH "SYNOPSIS" +.B memdiskfind +.SH "DESCRIPTION" +.PP +The \fBmemdiskfind\fR utility searches memory for a \fBmemdisk\fR instance, +and, if found, outputs the parameters needed to use the \fphram\fR driver in +Linux to map it. diff --git a/utils/isohybrid.c b/utils/isohybrid.c index 97d43b86..410bb606 100644 --- a/utils/isohybrid.c +++ b/utils/isohybrid.c @@ -228,8 +228,8 @@ printh(void) printf("\n"); printf("Options:\n"); - printf(FMT, " -h <X>", "Number of default geometry heads"); - printf(FMT, " -s <X>", "Number of default geometry sectors"); + printf(FMT, " -h <X>", "Number of geometry heads (default 64)"); + printf(FMT, " -s <X>", "Number of geometry sectors (default 32)"); printf(FMT, " -e --entry", "Specify partition entry number (1-4)"); printf(FMT, " -o --offset", "Specify partition offset (default 0)"); printf(FMT, " -t --type", "Specify partition type (default 0x17)"); |