Merge branch 'master' into libinstaller_dos_wip

Resolved Conflicts:
	libinstaller/syslxopt.c
	mtools/syslinux.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --cc mtools/syslinux.c
index 937f6b8,b5f5200..ac189c6
mode 100755,100644..100755
--- 1/mtools/syslinux.c
--- 2/mtools/syslinux.c
+++ b/mtools/syslinux.c
@@@ -197,7 -221,8 +221,9 @@@ int main(int argc, char *argv[]
            "  offset=%llu\n",
            (unsigned long)mypid,
            dev_fd, (unsigned long long)opt.offset);
-     fclose(mtc);
++
+     if (ferror(mtc) || fclose(mtc))
+       die_err(mtools_conf);
  
      /*
       * Run mtools to create the LDLINUX.SYS file