Changeset 2943 in MondoRescue

Timestamp:

Feb 3, 2012, 2:11:13 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Adds brtfs support (Michael Caerwyn mcaerwyn_at_gmail.com)

Location:

branches/3.0

Files:

• mindi/deplist.d/fs.conf (modified) (3 diffs)
• mindi/mindi (modified) (1 diff)
• mondo/src/include/my-stuff.h (modified) (2 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (2 diffs)

branches/3.0/mindi/deplist.d/fs.conf

@@ -20 +20 @@
 /sbin/mkfs.minix
 /sbin/mkfs.ocfs2
+/sbin/mkfs.btrfs
 
 #
@@ -34 +35 @@
 /sbin/fsck.jfs
 /sbin/badblocks
+/sbin/btrfsck
 
 # ext2/3
@@ -55 +57 @@
 
 #
+# BTRFS
+#
+/sbin/btrfs
+/sbin/btrfs-convert
+/sbin/btrfsctl
+/sbin/btrfs-debug-tree
+/sbin/btrfs-image
+/sbin/btrfs-map-logical
+/sbin/btrfs-show
+/sbin/btrfstune
+/sbin/btrfs-vol
+/sbin/btrfs-zero-log
+
+#
 # XFS
 #

branches/3.0/mindi/mindi

@@ -66 +66 @@
 CDROM_MODS="$TAPE_MODS $IDE_MODS $USB_MODS $PCMCIA_MODS $SCSI_MODS $NET_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_base nls_cp437 nls_utf8 sg sr_mod zlib_inflate iso9660 vfat fat"
 # Those modules will only go on the backup media, not the boot media.
-EXTRA_MODS="$CDROM_MODS loop md-mod linear raid0 raid1 xor raid10 raid5 raid456 raid6_pq async_pq xor async_tx async_memcpy async_xor lvm-mod dm-mod dm_mod dm-snapshot dm_snapshot dm-zero dm_zero dm-mirror dm_mirror dm-multipath dm-round-robin dm-emc dm-hp-sw dm-rdac dm-region-hash dm-snapshot dm-log multipath jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache ext4 jbd2 crc16 ocfs2 ocfs2_dlm ocfs2_nodemanager configfs"
+EXTRA_MODS="$CDROM_MODS loop md-mod linear raid0 raid1 xor raid10 raid5 raid456 raid6_pq async_pq xor async_tx async_memcpy async_xor lvm-mod dm-mod dm_mod dm-snapshot dm_snapshot dm-zero dm_zero dm-mirror dm_mirror dm-multipath dm-round-robin dm-emc dm-hp-sw dm-rdac dm-region-hash dm-snapshot dm-log multipath jfs xfs btrfs zlib_deflate libcrc32c xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache ext4 jbd2 crc16 ocfs2 ocfs2_dlm ocfs2_nodemanager configfs"
 # Replace with that line for HP OCMP e.g.
 #DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu fdomain"

branches/3.0/mondo/src/include/my-stuff.h

@@ -311 +311 @@
 #define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/md"
 #define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
-#define SANE_FORMATS        "swap image vfat ext2 ext3 ext4 xfs vfs jfs reiserfs vmfs dos minix coda fuse.sshfs nfs nfs4 ntfs ntfs-3g hpfs raid lvm cifs ocfs ocfs2"
+#define SANE_FORMATS        "swap image vfat ext2 ext3 ext4 xfs vfs jfs reiserfs vmfs dos minix coda fuse.sshfs nfs nfs4 ntfs ntfs-3g hpfs raid lvm cifs ocfs ocfs2 btrfs"
 #define ALT_TAPE        "/dev/ht0"
 #define MKE2FS_OR_NEWFS "mke2fs"
@@ -343 +343 @@
 
 #define DO_MBR_PLEASE "/tmp/DO-MBR-PLEASE"
+#define MONDO_MNTLISTCHG "/tmp/mountlist.changed"
 
 

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

@@ -2102 +2102 @@
                || strcmp(format, "ext4") == 0 
                || strcmp(format, "xfs") == 0
-               || strcmp(format, "jfs") == 0) {
+               || strcmp(format, "jfs") == 0
+                   || strcmp(format, "btrfs") == 0) {
         strcpy(partcode, "83");
     } else if (strcmp(format, "minix") == 0) {
@@ -2431 +2432 @@
     } else if (strcmp(format, "ext4") == 0) {
         strcpy(program, "mkfs -t ext4 -F -q");
+    } else if (strcmp(format, "btrfs") == 0) {
+            strcpy(program, "mkfs.btrfs");
     } else if (strcmp(format, "minix") == 0) {
         strcpy(program, "mkfs.minix");