Changeset b0ac906b283b428ba1c7f35fe1e71a84b3d3d9c6 for extlinux

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:

extlinux

Files:

• Makefile (modified) (1 diff)
• main.c (modified) (10 diffs)
• ntfs.h (added)

extlinux/Makefile

@@ -12 +12 @@
 
 ##
-## Linux vfat, ext2/ext3/ext4 and btrfs installer
+## Linux vfat, ntfs, ext2/ext3/ext4 and btrfs installer
 ##
 

extlinux/main.c

@@ -15 +15 @@
  * extlinux.c
  *
- * Install the syslinux boot block on an fat, ext2/3/4 and btrfs filesystem
+ * Install the syslinux boot block on an fat, ntfs, ext2/3/4 and btrfs filesystem
  */
 
@@ -46 +46 @@
 #include "btrfs.h"
 #include "fat.h"
+#include "ntfs.h"
 #include "../version.h"
 #include "syslxint.h"
 #include "syslxcom.h" /* common functions shared with extlinux and syslinux */
+#include "syslxfs.h"
 #include "setadv.h"
 #include "syslxopt.h" /* unified options */
@@ -215 +217 @@
     uint64_t totalbytes, totalsectors;
     int nsect;
-    struct boot_sector *sbs;
+    struct fat_boot_sector *sbs;
     char *dirpath, *subpath, *xdirpath;
     int rv;
@@ -272 +274 @@
     dprintf("heads = %u, sect = %u\n", geo.heads, geo.sectors);
 
-    sbs = (struct boot_sector *)syslinux_bootsect;
+    sbs = (struct fat_boot_sector *)syslinux_bootsect;
 
     totalsectors = totalbytes >> SECTOR_SHIFT;
@@ -293 +295 @@
     nsect += 2;                 /* Two sectors for the ADV */
     sectp = alloca(sizeof(sector_t) * nsect);
-    if (fs_type == EXT2 || fs_type == VFAT) {
+    if (fs_type == EXT2 || fs_type == VFAT || fs_type == NTFS) {
         if (sectmap(fd, sectp, nsect)) {
                 perror("bmap");
@@ -324 +326 @@
     struct ext2_super_block sb;
     struct btrfs_super_block sb2;
-    struct boot_sector sb3;
+    struct fat_boot_sector sb3;
+    struct ntfs_boot_sector sb4;
     bool ok = false;
 
@@ -349 +352 @@
         if (fat_check_sb_fields(&sb3))
                 ok = true;
+    } else if (fs_type == NTFS) {
+        if (xpread(fd, &sb4, sizeof(sb4), 0) != sizeof(sb4)) {
+            perror("reading ntfs superblock");
+            return 1;
+        }
+
+        if (ntfs_check_sb_fields(&sb4))
+             ok = true;
     }
     if (!ok) {
-        fprintf(stderr, "no fat, ext2/3/4 or btrfs superblock found on %s\n",
+        fprintf(stderr, "no fat, ntfs, ext2/3/4 or btrfs superblock found on %s\n",
                         device);
         return 1;
     }
     if (fs_type == VFAT) {
-        struct boot_sector *sbs = (struct boot_sector *)syslinux_bootsect;
-        if (xpwrite(fd, &sbs->bsHead, bsHeadLen, 0) != bsHeadLen ||
-            xpwrite(fd, &sbs->bsCode, bsCodeLen,
-                    offsetof(struct boot_sector, bsCode)) != bsCodeLen) {
+        struct fat_boot_sector *sbs = (struct fat_boot_sector *)syslinux_bootsect;
+        if (xpwrite(fd, &sbs->FAT_bsHead, FAT_bsHeadLen, 0) != FAT_bsHeadLen ||
+            xpwrite(fd, &sbs->FAT_bsCode, FAT_bsCodeLen,
+                    offsetof(struct fat_boot_sector, FAT_bsCode)) != FAT_bsCodeLen) {
             perror("writing fat bootblock");
             return 1;
         }
+    } else if (fs_type == NTFS) {
+        struct ntfs_boot_sector *sbs =
+                (struct ntfs_boot_sector *)syslinux_bootsect;
+        if (xpwrite(fd, &sbs->NTFS_bsHead,
+                    NTFS_bsHeadLen, 0) != NTFS_bsHeadLen ||
+                    xpwrite(fd, &sbs->NTFS_bsCode, NTFS_bsCodeLen,
+                    offsetof(struct ntfs_boot_sector,
+                    NTFS_bsCode)) != NTFS_bsCodeLen) {
+            perror("writing ntfs bootblock");
+            return 1;
+        }
     } else {
         if (xpwrite(fd, syslinux_bootsect, syslinux_bootsect_len, 0)
@@ -755 +777 @@
 int install_file(const char *path, int devfd, struct stat *rst)
 {
-        if (fs_type == EXT2 || fs_type == VFAT)
+        if (fs_type == EXT2 || fs_type == VFAT || fs_type == NTFS)
                 return ext2_fat_install_file(path, devfd, rst);
         else if (fs_type == BTRFS)
@@ -829 +851 @@
                     break;
                 }
+    case NTFS:
+        if ((!strcmp(mnt->mnt_type, "fuseblk") /* ntfs-3g */ ||
+             !strcmp(mnt->mnt_type, "ntfs")) &&
+            !stat(mnt->mnt_fsname, &dst) &&
+            dst.st_rdev == dev) {
+            done = true;
+            break;
+        }
+
+        break;
         case NONE:
             break;
@@ -911 +943 @@
     else if (sfs.f_type == MSDOS_SUPER_MAGIC)
         fs_type = VFAT;
+    else if (sfs.f_type == NTFS_SB_MAGIC ||
+                sfs.f_type == FUSE_SUPER_MAGIC /* ntfs-3g */)
+        fs_type = NTFS;
 
     if (!fs_type) {
-        fprintf(stderr, "%s: not a fat, ext2/3/4 or btrfs filesystem: %s\n",
+        fprintf(stderr, "%s: not a fat, ntfs, ext2/3/4 or btrfs filesystem: %s\n",
                 program, path);
         return -1;