aboutsummaryrefslogtreecommitdiffstats
path: root/mtools
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-14 13:57:50 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-14 13:57:50 -0800
commit3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea (patch)
tree468f0e19dfbbf773ddd980211b042f4402919c03 /mtools
parent5e50b4d4faf398f072c0dea814b11db1a95efeec (diff)
parentb82686b524d2ee4441ce411fa6db3a210edbaa34 (diff)
downloadsyslinux-3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea.tar.gz
syslinux-3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea.tar.xz
syslinux-3eefc9d3f7c9ada3d75fc0c7ef564feb0d6d3eea.zip
Merge branch 'master' into pathbased
Resolved Conflicts: com32/Makefile com32/include/syslinux/pxe.h core/pxelinux.asm core/syslinux.ld Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'mtools')
-rw-r--r--mtools/syslinux.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mtools/syslinux.c b/mtools/syslinux.c
index aca24c92..2c5387ed 100644
--- a/mtools/syslinux.c
+++ b/mtools/syslinux.c
@@ -221,8 +221,9 @@ int main(int argc, char *argv[])
exit(1);
}
fprintf(mtc,
- /* "MTOOLS_NO_VFAT=1\n" */
- "MTOOLS_SKIP_CHECK=1\n" /* Needed for some flash memories */
+ /* These are needed for some flash memories */
+ "MTOOLS_SKIP_CHECK=1\n"
+ "MTOOLS_FAT_COMPATIBILITY=1\n"
"drive s:\n"
" file=\"/proc/%lu/fd/%d\"\n"
" offset=%llu\n",