diff options
author | Matt Fleming <matt.fleming@intel.com> | 2012-05-31 12:16:22 +0100 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2012-05-31 13:45:42 +0100 |
commit | 894c81b75aa2ffc4eef3c56e4c72fe70c4080b99 (patch) | |
tree | 37b5135e79a69a30e2eac3f81a17efdd4701a813 /com32/hdt/hdt-common.h | |
parent | 98e33fa25fb8feeb66cbf20b9cba0d5adff3e658 (diff) | |
parent | ba42e1409ece2e9d56728e0ee6a6342c05ec6e52 (diff) | |
download | syslinux-894c81b75aa2ffc4eef3c56e4c72fe70c4080b99.tar.gz |
Merge remote-tracking branch 'zytor/master' into merge/elflink/master
A lot of development has gone on in the 'master' branch since the last
time we merged; new features, bug fixes, etc, etc.
Conflicts:
Makefile
com32/Makefile
com32/lib/Makefile
com32/lib/syslinux/load_linux.c
com32/modules/Makefile
com32/modules/chain.c
core/bootsect.inc
core/init.inc
version
Diffstat (limited to 'com32/hdt/hdt-common.h')
-rw-r--r-- | com32/hdt/hdt-common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/com32/hdt/hdt-common.h b/com32/hdt/hdt-common.h index fec213d9..4a288b44 100644 --- a/com32/hdt/hdt-common.h +++ b/com32/hdt/hdt-common.h @@ -211,10 +211,12 @@ struct s_hardware { char modules_alias_path[255]; char pciids_path[255]; char dump_path[255]; /* Dump path on the tftp server */ + char dump_filename[255]; /* Dump filename on the tftp server */ char tftp_ip[255]; /* IP address of tftp server (dump mode) */ char memtest_label[255]; char auto_label[AUTO_COMMAND_SIZE]; char vesa_background[255]; + char postexec[255]; }; void reset_more_printf(void); |