Changeset b0ac906b283b428ba1c7f35fe1e71a84b3d3d9c6 for linux

Timestamp:

09/07/11 07:19:05 (9 months ago)

Author:

Paulo Alcantara <pcacjr@…>

Children:

045bc5cd1118fee51b19d89dc316038c8a93e5bf

Parents:

67954e370003d9bbfd8b58042669f2e9d532636f

git-author:

Paulo Alcantara <pcacjr@gmail.com> / 2011-07-05T21:32:51Z+0000

git-committer:

Paulo Alcantara <pcacjr@gmail.com> / 2011-09-07T07:19:05Z+0000

Message:

Add NTFS filesystem support to Linux and Windows installers

Signed-off-by: Paulo Alcantara <pcacjr@…>

Location:

linux

Files:

• Makefile (modified) (2 diffs)
• syslinux.c (modified) (4 diffs)

linux/Makefile

@@ -12 +12 @@
 
 ##
-## Linux FAT installer
+## Linux FAT/NTFS installer
 ##
 
@@ -29 +29 @@
            ../libinstaller/setadv.c \
            ../libinstaller/advio.c \
-           ../libinstaller/fat.c \
+           ../libinstaller/fs.c \
            ../libinstaller/syslxmod.c \
            ../libinstaller/bootsect_bin.c \

linux/syslinux.c

@@ -70 +70 @@
 #include <sysexits.h>
 #include "syslxcom.h"
+#include "syslxfs.h"
 #include "setadv.h"
 #include "syslxopt.h" /* unified options */
@@ -295 +296 @@
     }
 
-    fs_type = VFAT;
     xpread(dev_fd, sectbuf, SECTOR_SIZE, opt.offset);
     fsync(dev_fd);
 
     /*
-     * Check to see that what we got was indeed an MS-DOS boot sector/superblock
-     */
-    if ((errmsg = syslinux_check_bootsect(sectbuf))) {
+     * Check to see that what we got was indeed an FAT/NTFS
+     * boot sector/superblock
+     */
+    if ((errmsg = syslinux_check_bootsect(sectbuf, &fs_type))) {
         fprintf(stderr, "%s: %s\n", opt.device, errmsg);
         exit(1);
@@ -358 +359 @@
     }
 
-    if (do_mount(dev_fd, &mnt_cookie, mntpath, "vfat") &&
-        do_mount(dev_fd, &mnt_cookie, mntpath, "msdos")) {
-        rmdir(mntpath);
-        die("mount failed");
+    if (fs_type == VFAT) {
+        if (do_mount(dev_fd, &mnt_cookie, mntpath, "vfat") &&
+            do_mount(dev_fd, &mnt_cookie, mntpath, "msdos")) {
+            rmdir(mntpath);
+            die("failed on mounting fat volume");
+        }
+    } else if (fs_type == NTFS) {
+        if (do_mount(dev_fd, &mnt_cookie, mntpath, "ntfs-3g")) {
+            rmdir(mntpath);
+            die("failed on mounting ntfs volume");
+        }
     }
 
@@ -475 +483 @@
 
     /* Copy the syslinux code into the boot sector */
-    syslinux_make_bootsect(sectbuf);
+    syslinux_make_bootsect(sectbuf, fs_type);
 
     /* Write new boot sector */