Commit 460d0566 authored by Thomas Schmitt's avatar Thomas Schmitt

Temporarily disabled the unfinished HP-PA PALO bootability preparations

parent 250ce991
......@@ -635,8 +635,7 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv,
"-rr_reloc_dir", "-hfsplus-serial-no", "-prep-boot-part", "-efi-boot-part",
"-hfsplus-block-size", "-apm-block-size", "--grub2-mbr",
"--grub2-sparc-core", "--sort-weight-list", "--sort-weight-patterns",
"-hppa-bootloader", "-hppa-cmdline", "-hppa-kernel-32", "-hppa-kernel-64",
"-hppa-ramdisk", "-hppa-hdrversion",
"-hppa-hdrversion",
""
};
static char arg2_options[][41]= {
......@@ -855,12 +854,18 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
" -mipsel-boot FILE Set mipsel boot image name (relative to image root)",
" -B FILES, -sparc-boot FILES Set sparc boot image names",
" -sparc-label label text Set sparc boot disk label",
#ifdef Libisofs_enable_unreleased_hppa_palO
" -hppa-cmdline CMDLINE Set hppa boot command line",
" -hppa-kernel-32 FILE Set hppa 32-bit image name (relative to image root)",
" -hppa-kernel-64 FILE Set hppa 64-bit image name (relative to image root)",
" -hppa-bootloader FILE Set hppa boot loader file name (relative to image root)",
" -hppa-ramdisk FILE Set hppa ramdisk file name (relative to image root)",
" -hppa-hdrversion NUMBER Set hppa PALO header version to 4 or 5",
#endif /* Libisofs_enable_unreleased_hppa_palO */
" --grub2-sparc-core FILE Set path of core file for disk label patching",
" -efi-boot-part DISKFILE|--efi-boot-image",
" Set data source for EFI System Partition",
......
......@@ -554,10 +554,17 @@ int Xorriso_status_hppa(struct XorrisO *xorriso, char *what, char *value,
int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image,
char *filter, FILE *fp, int flag)
{
int i, num_boots, sa_type, ret;
char *paths[15], *line, num[4];
int i, num_boots, sa_type;
char *paths[15], *line;
#ifdef Libisofs_enable_unreleased_hppa_palO
int ret;
char num[4];
char *cmdline, *bootloader, *kernel_32, *kernel_64, *ramdisk;
#endif
line= xorriso->result_line;
sa_type= (xorriso->system_area_options & 0xfc) >> 2;
......@@ -591,6 +598,9 @@ int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image,
return(num_boots);
}
if(sa_type == 4 || sa_type == 5) {
#ifdef Libisofs_enable_unreleased_hppa_palO
ret= iso_image_get_hppa_palo(image, &cmdline, &bootloader, &kernel_32,
&kernel_64, &ramdisk);
if(ret == 1) {
......@@ -602,6 +612,9 @@ int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image,
sprintf(num, "%d", sa_type);
Xorriso_status_hppa(xorriso, "hdrversion", num, filter, fp, 0);
}
#endif /* ! Libisofs_enable_unreleased_hppa_palO */
return(0);
}
return(0);
......@@ -1289,8 +1302,14 @@ int Xorriso_set_hppa_boot_parm(struct XorrisO *xorriso, char *text, char *what,
par[0]= par[1]= par[2]= par[3]= par[4]= NULL;
if(flag & 1) {
/* Give up HP-PA boot parameters */
#ifdef Libisofs_enable_unreleased_hppa_palO
iso_image_set_hppa_palo(image, par[0], par[1], par[2], par[3], par[4],
1);
#endif
return(1);
}
if(strcmp(what, "cmdline") == 0) {
......@@ -1324,6 +1343,9 @@ int Xorriso_set_hppa_boot_parm(struct XorrisO *xorriso, char *text, char *what,
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0);
}
#ifdef Libisofs_enable_unreleased_hppa_palO
ret= iso_image_set_hppa_palo(image, par[0], par[1], par[2], par[3], par[4],
0);
if (ret < 0) {
......@@ -1333,6 +1355,15 @@ int Xorriso_set_hppa_boot_parm(struct XorrisO *xorriso, char *text, char *what,
return(0);
}
return(1);
#else
strcpy(xorriso->info_text, "HP-PA boot preparations are not yet supported");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0);
#endif /* ! Libisofs_enable_unreleased_hppa_palO */
}
......
......@@ -1684,8 +1684,14 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" |\"efi_boot_part=\"|\"efi_boot_part=--efi-boot-image\"",
" |\"mips_path=\"|\"mipsel_path=\"|\"mips_discard\"",
" |\"sparc_label=\"|\"grub2_sparc_core=\"|\"sparc_discard\"",
#ifdef Libisofs_enable_unreleased_hppa_palO
" |\"hppa_cmdline=\"|\"hppa_bootloader=\"|\"hppa_kernel_32\"",
" |\"hppa_kernel_64=\"|\"hppa_ramdisk=\"",
" |\"hppa_kernel_64=\"|\"hppa_ramdisk=\"|\"hppa_hdrversion\"",
#endif
" |\"hfsplus_serial=\"|\"hfsplus_block_size=\"",
" |\"apm_block_size=\"|\"show_status\"",
" Whether to discard or keep an exiting El Torito boot image.",
......
......@@ -9,7 +9,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH XORRISO 1 "Version 1.3.5, Jan 20, 2014"
.TH XORRISO 1 "Version 1.3.5, Mar 03, 2014"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
......@@ -308,6 +308,10 @@ On FreeBSD the device files have names like
.br
\-dev /dev/cd0
.br
On NetBSD:
.br
\-dev /dev/rcd0d
.br
On OpenSolaris:
.br
\-dev /dev/rdsk/c4t0d0s2
......@@ -425,7 +429,7 @@ MBR, GPT and APM are combinable. APM occupies the first 8 bytes of
MBR boot code. All three do not hamper El Torito booting from CDROM.
.br
There is support for further facilities:
MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC, HP\-PA.
MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC.
Those are mutually not combinable and also not combinable with MBR, GPT,
or APM.
.br
......@@ -2888,7 +2892,7 @@ can assume overwriteable media.
There are booting mechanisms which do not use an El Torito record but rather
start at the first bytes of the image: PC\-BIOS MBR for hard\-disk\-like devices,
MIPS Volume Header for old SGI computers, DEC Boot Block for old DECstation,
SUN Disk Label for SPARC machines, HP\-PA boot sector for HP PA\-RISC machines.
SUN Disk Label for SPARC machines.
.br
The boot firmware EFI may use programs which are located in a FAT filesystem
and announced by an MBR partition table entry.
......@@ -3144,31 +3148,9 @@ of the given file to be written after the SUN Disk Label. Both numbers are
counted in bytes. The address is written as 64 bit big\-endian number to
byte 0x228. The size is written as 32 bit big\-endian number to byte 0x230.
.br
\fBhppa_cmdline=\fRtext sets the PALO command line for HP\-PA. Up to 1023
characters are permitted by default. With hppa_hdrversion=4 the limit is 127.
.br
Note that the first five hppa_ bootspecs are mandatory, if any of the
hppa_ bootspecs is used. Only hppa_hdrversion= is allowed to be missing.
.br
\fBhppa_bootloader=\fRiso_rr_path designates the given path as HP\-PA
bootloader file.
.br
\fBhppa_kernel_32=\fRiso_rr_path designates the given path as HP\-PA
32 bit kernel file.
.br
\fBhppa_kernel_64=\fRiso_rr_path designates the given path as HP\-PA
64 bit kernel file.
.br
\fBhppa_ramdisk=\fRiso_rr_path designates the given path as HP\-PA
RAM disk file.
.br
\fBhppa_hdrversion=\fRnumber chooses between PALO header version 5 (default)
and version 4.
For the appropriate value see in PALO source code: PALOHDRVERSION.
.br
\fBmips_discard\fR, \fBsparc_discard\fR, and \fBhppa_discard\fR
revoke any boot file declarations made for mips or mipsel, resp. sparc,
resp. hppa. This removes the ban on production of other boot blocks.
\fBmips_discard\fR and \fBsparc_discard\fR
revoke any boot file declarations made for mips or mipsel resp. sparc.
This removes the ban on production of other boot blocks.
.br
\fBhfsplus_serial=\fRhexstring sets a string of 16 digits "0" to "9"
and letters "a" to "f", which will be used as unique serial number of
......@@ -4986,8 +4968,8 @@ Restore directory trees from a particular ISO session to disk
Try to retrieve blocks from a damaged medium
.SS
.B As superuser learn about available drives
On Linux or FreeBSD consider to give rw\-permissions to those users or groups
which shall be able to use the drives with \fBxorriso\fR.
On Linux, FreeBSD or NetBSD consider to give rw\-permissions to those users
or groups which shall be able to use the drives with \fBxorriso\fR.
On Solaris use pfexec. Consider to restrict privileges of \fBxorriso\fR to
"base,sys_devices" and to give r\-permission to user or group.
.br
......
This diff is collapsed.
......@@ -50,7 +50,7 @@
@c man .\" First parameter, NAME, should be all caps
@c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
@c man .\" other parameters are allowed: see man(7), man(1)
@c man .TH XORRISO 1 "Version 1.3.5, Jan 20, 2014"
@c man .TH XORRISO 1 "Version 1.3.5, Mar 03, 2014"
@c man .\" Please adjust this date whenever revising the manpage.
@c man .\"
@c man .\" Some roff macros, for reference:
......@@ -438,6 +438,10 @@ On FreeBSD the device files have names like
@*
-dev /dev/cd0
@*
On NetBSD:
@*
-dev /dev/rcd0d
@*
On OpenSolaris:
@*
-dev /dev/rdsk/c4t0d0s2
......@@ -567,7 +571,7 @@ MBR, GPT and APM are combinable. APM occupies the first 8 bytes of
MBR boot code. All three do not hamper El Torito booting from CDROM.
@*
There is support for further facilities:
MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC, HP-PA.
MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC.
Those are mutually not combinable and also not combinable with MBR, GPT,
or APM.
@*
......@@ -3401,7 +3405,7 @@ can assume overwriteable media.
There are booting mechanisms which do not use an El Torito record but rather
start at the first bytes of the image: PC-BIOS MBR for hard-disk-like devices,
MIPS Volume Header for old SGI computers, DEC Boot Block for old DECstation,
SUN Disk Label for SPARC machines, HP-PA boot sector for HP PA-RISC machines.
SUN Disk Label for SPARC machines.
@*
The boot firmware EFI may use programs which are located in a FAT filesystem
and announced by an MBR partition table entry.
......@@ -3676,32 +3680,9 @@ of the given file to be written after the SUN Disk Label. Both numbers are
counted in bytes. The address is written as 64 bit big-endian number to
byte 0x228. The size is written as 32 bit big-endian number to byte 0x230.
@*
@cindex HP-PA boot sector, production
@strong{hppa_cmdline=}text sets the PALO command line for HP-PA. Up to 1023
characters are permitted by default. With hppa_hdrversion=4 the limit is 127.
@*
Note that the first five hppa_ bootspecs are mandatory, if any of the
hppa_ bootspecs is used. Only hppa_hdrversion= is allowed to be missing.
@*
@strong{hppa_bootloader=}iso_rr_path designates the given path as HP-PA
bootloader file.
@*
@strong{hppa_kernel_32=}iso_rr_path designates the given path as HP-PA
32 bit kernel file.
@*
@strong{hppa_kernel_64=}iso_rr_path designates the given path as HP-PA
64 bit kernel file.
@*
@strong{hppa_ramdisk=}iso_rr_path designates the given path as HP-PA
RAM disk file.
@*
@strong{hppa_hdrversion=}number chooses between PALO header version 5 (default)
and version 4.
For the appropriate value see in PALO source code: PALOHDRVERSION.
@*
@strong{mips_discard}, @strong{sparc_discard}, and @strong{hppa_discard}
revoke any boot file declarations made for mips or mipsel, resp. sparc,
resp. hppa. This removes the ban on production of other boot blocks.
@strong{mips_discard} and @strong{sparc_discard}
revoke any boot file declarations made for mips or mipsel resp. sparc.
This removes the ban on production of other boot blocks.
@*
@cindex HFS+ serial number
@strong{hfsplus_serial=}hexstring sets a string of 16 digits "0" to "9"
......@@ -5819,8 +5800,8 @@ Use text as name of this program and perform -help.
@c man .B As superuser learn about available drives
@node ExDevices, ExCreate, Frontend, Examples
@section As superuser learn about available drives
On Linux or FreeBSD consider to give rw-permissions to those users or groups
which shall be able to use the drives with @command{xorriso}.
On Linux, FreeBSD or NetBSD consider to give rw-permissions to those users
or groups which shall be able to use the drives with @command{xorriso}.
On Solaris use pfexec. Consider to restrict privileges of @command{xorriso} to
"base,sys_devices" and to give r-permission to user or group.
@*
......
#define Xorriso_timestamP "2014.03.02.102010"
#define Xorriso_timestamP "2014.03.03.202815"
......@@ -9,7 +9,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH XORRISOFS 1 "Version 1.3.5, Jan 15, 2014"
.TH XORRISOFS 1 "Version 1.3.5, Mar 03, 2014"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
......@@ -1206,29 +1206,6 @@ to be written after the SUN Disk Label. Both numbers are counted in bytes.
The address is written as 64 bit big\-endian number to byte 0x228.
The size is written as 32 bit big\-endian number to byte 0x230.
.TP
\fB\-hppa-cmdline\fR text
Set the PALO command line for HP\-PA. Up to 1023 characters are permitted
by default. With \-hppa\-hdrversion 4 the limit is 127.
.br
Note that the first five \-hppa options are mandatory, if any of the \-hppa
options is given. Only option \-hppa\-hdrversion is allowed to be missing.
.TP
\fB\-hppa-bootloader\fR iso_rr_path
Designate the given path as HP\-PA bootloader file.
.TP
\fB\-hppa-kernel-32\fR iso_rr_path
Designate the given path as HP\-PA 32 bit kernel file.
.TP
\fB\-hppa-kernel-64\fR iso_rr_path
Designate the given path as HP\-PA 64 bit kernel file.
.TP
\fB\-hppa-ramdisk\fR iso_rr_path
Designate the given path as HP\-PA RAM disk file.
.TP
\fB\-hppa-hdrversion\fR number
Choose between PALO header version 5 (default) and version 4.
For the appropriate value see in PALO source code: PALOHDRVERSION.
.TP
.B Character sets:
.PP
Character sets should not matter as long as only english alphanumeric
......
No preview for this file type
......@@ -50,7 +50,7 @@
@c man .\" First parameter, NAME, should be all caps
@c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
@c man .\" other parameters are allowed: see man(7), man(1)
@c man .TH XORRISOFS 1 "Version 1.3.5, Jan 15, 2014"
@c man .TH XORRISOFS 1 "Version 1.3.5, Mar 03, 2014"
@c man .\" Please adjust this date whenever revising the manpage.
@c man .\"
@c man .\" Some roff macros, for reference:
......@@ -1622,41 +1622,6 @@ Cause the content address and size of the given data file in the image
to be written after the SUN Disk Label. Both numbers are counted in bytes.
The address is written as 64 bit big-endian number to byte 0x228.
The size is written as 32 bit big-endian number to byte 0x230.
@c man .TP
@item -hppa-cmdline text
@kindex -hppa-cmdline HP-PA PALO command line
@cindex Bootability, control, -hppa-cmdline
Set the PALO command line for HP-PA. Up to 1023 characters are permitted
by default. With -hppa-hdrversion 4 the limit is 127.
@*
Note that the first five -hppa options are mandatory, if any of the -hppa
options is given. Only option -hppa-hdrversion is allowed to be missing.
@c man .TP
@item -hppa-bootloader iso_rr_path
@kindex -hppa-bootloader HP-PA bootloader file
@cindex Bootability, control, -hppa-bootloader
Designate the given path as HP-PA bootloader file.
@c man .TP
@item -hppa-kernel-32 iso_rr_path
@kindex -hppa-kernel_32 HP-PA kernel_32 file
@cindex Bootability, control, -hppa-kernel_32
Designate the given path as HP-PA 32 bit kernel file.
@c man .TP
@item -hppa-kernel-64 iso_rr_path
@kindex -hppa-kernel_64 HP-PA kernel_64 file
@cindex Bootability, control, -hppa-kernel_64
Designate the given path as HP-PA 64 bit kernel file.
@c man .TP
@item -hppa-ramdisk iso_rr_path
@kindex -hppa-ramdisk HP-PA ramdisk file
@cindex Bootability, control, -hppa-ramdisk
Designate the given path as HP-PA RAM disk file.
@c man .TP
@item -hppa-hdrversion number
@kindex -hppa-hdrversion HP-PA PALO header version
@cindex Bootability, control, -hppa-hdrversion
Choose between PALO header version 5 (default) and version 4.
For the appropriate value see in PALO source code: PALOHDRVERSION.
@end table
@c man .TP
@c man .B Character sets:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment