libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-enabled HP-PA PALO boot preparations

Browse Source
This commit is contained in:
Thomas Schmitt
2014-04-09 07:31:47 +00:00
parent d9da6c9f1b
commit 9ae6878a66
9 changed files with 209 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libisoburn/trunk/xorriso/iso_img.c
View File

@ -556,15 +556,10 @@ int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image,
{
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;
@ -598,9 +593,6 @@ 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) {
@ -612,9 +604,6 @@ 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);
@ -1299,14 +1288,8 @@ 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) {
@ -1340,9 +1323,6 @@ 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) {
@ -1352,15 +1332,6 @@ 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 */
}