diff options
| author | Alek Du <alek.du@intel.com> | 2010-06-08 22:28:33 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-06-09 10:57:27 -0700 |
| commit | 146c34a2632a4295b1aef44ef79e84b4d4b9cf7e (patch) | |
| tree | eb744f032eaee413fcff54c3c67ad2f8daab5207 /libinstaller/syslinux.h | |
| parent | 0153498e9ce97fbf7329b590ddb7a373e33b12e6 (diff) | |
| download | syslinux-146c34a2632a4295b1aef44ef79e84b4d4b9cf7e.tar.gz | |
Make syslinux installer real "pathbased"
The previous merging extlinux/syslinux patch is not sufficient, the
syslinux is not real "patchbased", hence:
* fill currentdir in patcharea
* search "extlinux.conf" and "syslinux.cfg" for generic_load_config
* define boot_image and boot_sector macro for ldsyslinux
this could make further merging extlinux and syslinux possible
Signed-off-by: Alek Du <alek.du@intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'libinstaller/syslinux.h')
| -rw-r--r-- | libinstaller/syslinux.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libinstaller/syslinux.h b/libinstaller/syslinux.h index 8d0212c8..311b9f2e 100644 --- a/libinstaller/syslinux.h +++ b/libinstaller/syslinux.h @@ -26,6 +26,11 @@ extern unsigned char syslinux_ldlinux[]; extern const unsigned int syslinux_ldlinux_len; extern const int syslinux_ldlinux_mtime; +#define boot_sector syslinux_bootsect +#define boot_sector_len syslinux_bootsect_len +#define boot_image syslinux_ldlinux +#define boot_image_len syslinux_ldlinux_len + extern unsigned char syslinux_mbr[]; extern const unsigned int syslinux_mbr_len; extern const int syslinux_mbr_mtime; @@ -42,6 +47,6 @@ const char *syslinux_check_bootsect(const void *bs); /* This patches the boot sector and ldlinux.sys based on a sector map */ int syslinux_patch(const uint32_t * sectors, int nsectors, - int stupid, int raid_mode); + int stupid, int raid_mode, const char *subdir); #endif |