diff options
| author | Pierre-Alexandre Meyer <pierre@mouraf.org> | 2009-09-07 16:12:59 -0700 |
|---|---|---|
| committer | Pierre-Alexandre Meyer <pierre@mouraf.org> | 2009-09-07 16:22:36 -0700 |
| commit | e9069caefc1460ec7f4d058796005474c125fc61 (patch) | |
| tree | 25cd847439fb004798251a63fa8886073134009f /com32/hdt/hdt-common.c | |
| parent | c93e27af183de1cdf591706448d42887d0fbc0eb (diff) | |
| parent | 03b2384b6e9f54d9697e87d2a19c321e6fd96ed5 (diff) | |
| download | syslinux-e9069caefc1460ec7f4d058796005474c125fc61.tar.gz | |
Merge branch 'bootloader-detection' into hdt-next
Conflicts:
com32/hdt/hdt-cli-disk.c
com32/hdt/hdt-common.h
com32/hdt/hdt-menu-disk.c
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Diffstat (limited to 'com32/hdt/hdt-common.c')
| -rw-r--r-- | com32/hdt/hdt-common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/com32/hdt/hdt-common.c b/com32/hdt/hdt-common.c index 80305a3e..11887c39 100644 --- a/com32/hdt/hdt-common.c +++ b/com32/hdt/hdt-common.c @@ -35,6 +35,7 @@ #include "hdt-common.h" #include "lib-ansi.h" #include <disk/util.h> +#include <disk/mbrs.h> /* ISOlinux requires a 8.3 format */ void convert_isolinux_filename(char *filename, struct s_hardware *hardware) { @@ -269,6 +270,9 @@ void detect_disks(struct s_hardware *hardware) if (err == -1 || !hardware->disk_info[i].cbios) continue; + /* Detect MBR */ + hardware->mbr_ids[i] = get_mbr_id(&hardware->disk_info[i]); + hardware->disks_count++; } } |