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

Provisory new -as mkisofs option -chrp-boot-part

Browse Source
This commit is contained in:
Thomas Schmitt 2012-06-12 19:27:23 +00:00
parent 40e9dfd42a
commit 103561d79f
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xorriso/emulators.c
View File

@ -575,7 +575,7 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv,
"--protective-msdos-label", "--boot-catalog-hide", "--no-emul-toc", "--protective-msdos-label", "--boot-catalog-hide", "--no-emul-toc",
"--emul-toc", "-disallow_dir_id_ext", "--old-empty", "--emul-toc", "-disallow_dir_id_ext", "--old-empty",
"--old-root-no-md5", "--old-root-devno", "--old-root-no-ino", "--old-root-no-md5", "--old-root-devno", "--old-root-no-ino",
"--no_rc", "--norock", "-hfsplus", "-fat", "--no_rc", "--norock", "-hfsplus", "-fat", "-chrp-boot-part",
"" ""
}; };
static char arg1_options[][41]= { static char arg1_options[][41]= {
@ -823,6 +823,9 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
" -mipsel-boot FILE Set mipsel boot image name (relative to image root)", " -mipsel-boot FILE Set mipsel boot image name (relative to image root)",
" -B FILES, -sparc-boot FILES Set sparc boot image names", " -B FILES, -sparc-boot FILES Set sparc boot image names",
" -sparc-label label text Set sparc boot disk label", " -sparc-label label text Set sparc boot disk label",
/* >>> -chrp-boot-part -prep-boot-part -efi-boot-part */
" -append_partition NUMBER TYPE FILE", " -append_partition NUMBER TYPE FILE",
" Append FILE after image. TYPE is hex: 0x..", " Append FILE after image. TYPE is hex: 0x..",
" --modification-date=YYYYMMDDhhmmsscc", " --modification-date=YYYYMMDDhhmmsscc",
@ -1795,6 +1798,10 @@ not_enough_args:;
if(ret <= 0) if(ret <= 0)
goto problem_handler_2; goto problem_handler_2;
} else if(strcmp(argpt, "-chrp-boot-part") == 0) {
xorriso->system_area_options= (xorriso->system_area_options & ~0x3cfc) |
0x400;
} else if(strcmp(argpt, "-prep-boot-part") == 0) { } else if(strcmp(argpt, "-prep-boot-part") == 0) {
if(i + 1 >= argc) if(i + 1 >= argc)
goto not_enough_args; goto not_enough_args;

10
xorriso/xorriso_private.h
View File

@ -376,6 +376,16 @@ struct XorrisO { /* the global context of xorriso */
0 = auto (align if bit1) 0 = auto (align if bit1)
1 = always align 1 = always align
2 = never align 2 = never align
bit10-13= System area sub type
With type 0 = MBR:
Gets overridden by bit0 and bit1.
0 = no particular sub type
1 = CHRP: A single MBR partition
of type 0x96 covers the ISO
image. Not compatible with
any other feature which
needs to have own MBR
partition entries.
*/ */
int patch_system_area; /* Bits as of system_area_options. int patch_system_area; /* Bits as of system_area_options.
to be applied to the loaded system to be applied to the loaded system

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2012.06.12.192702" #define Xorriso_timestamP "2012.06.12.192817"