Changeset 2779 in MondoRescue

Timestamp:

Apr 29, 2011, 3:36:06 PM (14 years ago)

Author:

Bruno Cornec

Message:

r2148@localhost (orig r2147): bruno | 2009-02-14 02:45:13 +0100
Fix NTFS support at restore time (Conor Daly)

Location:

branches/2.2.8

Files:

• mindi/deplist.txt (modified) (2 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (1 diff)

branches/2.2.8/mindi/deplist.txt

@@ -20 +20 @@
 
 #----- Covers a multitude of sins, including XFS, JFS, ReiserFS, and RAID -----
-mkfs mkswap mkswapfs mkfs.swap mkfs.ext2 mke2fs mkfs.vfat mkfs.dos mkdosfs mkvfatfs mkfatfs mkreiserfs mkfs.reiserfs mkfs.reiser mkfs.ext3 mke3fs mkfs.ext4 mke4fs mkfs.jfs mkfs.xfs mkfs.ocfs2 mkxfs mkjfs mkxfsfs mkjfsfs logdump logredo xchkdmp xchklog xpeek mkpv mkraid raid0run raidhotadd raidhotremove raidsetfaulty raidstart raidstop e2label tune2fs e2fsadm mdadm /etc/mke2fs.conf reiserfstune
+mkfs mkswap mkswapfs mkfs.swap mkfs.ext2 mke2fs mkfs.vfat mkfs.ntfs mkfs.dos mkdosfs mkvfatfs mkntfs mkfatfs mkreiserfs mkfs.reiserfs mkfs.reiser mkfs.ext3 mke3fs mkfs.ext4 mke4fs mkfs.jfs mkfs.xfs mkfs.ocfs2 mkxfs mkjfs mkxfsfs mkjfsfs logdump logredo xchkdmp xchklog xpeek mkpv mkraid raid0run raidhotadd raidhotremove raidsetfaulty raidstart raidstop e2label tune2fs e2fsadm mdadm /etc/mke2fs.conf reiserfstune
 fsck fsck.ext2 fsck.reiserfs fsck.reiser fsck.xfs fsck.ext3 fsck.jfs badblocks fsck.ext4
 vmkfstools
@@ -50 +50 @@
 /sbin/mount.smb /sbin/mount.smb3
 /sbin/mount.smbfs /sbin/mount.smbfs3
+/sbin/mount.ntfs /sbin/mount.ntfs-3g
 # helps for debugging
 /usr/bin/ldd

branches/2.2.8/mondo/src/mondorestore/mondo-prep.c

@@ -2406 +2406 @@
     } else if (strcmp(format, "vmfs") == 0) {
         strcpy(program, "mkfs -t vmfs");
+    } else if (strcmp(format, "ntfs") == 0) { 
+        /* 
+         * mkfs.ntfs treats the '-c' switch as 'specify cluster size' 
+         * so the default "mkfs -t %s -c" command structure fails 
+         */ 
+        strcpy(program, "mkfs -t ntfs");
     } else if (strcmp(format, "ocfs2") == 0) {
         /*