Changeset 2087 in MondoRescue for branches/2.2.8/mondo/src

Timestamp:

Dec 14, 2008, 3:50:37 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Adds ext4 support

Location:

branches/2.2.8/mondo/src

Files:

• include/my-stuff.h (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (2 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (1 diff)
• restore-scripts/mondo/hack-fstab (modified) (1 diff)
• restore-scripts/mondo/label-partitions-as-necessary (modified) (1 diff)

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

@@ -322 +322 @@
 #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 xfs vfs jfs reiserfs vmfs dos minix coda nfs ntfs hpfs raid lvm cifs ocfs ocfs2"
+#define SANE_FORMATS        "swap image vfat ext2 ext3 ext4 xfs vfs jfs reiserfs vmfs dos minix coda nfs ntfs hpfs raid lvm cifs ocfs ocfs2"
 #define ALT_TAPE        "/dev/ht0"
 #define MKE2FS_OR_NEWFS "mke2fs"

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

@@ -2070 +2070 @@
                || strcmp(format, "reiserfs") == 0
                || strcmp(format, "ext3") == 0 
+               || strcmp(format, "ext4") == 0 
                || strcmp(format, "xfs") == 0
                || strcmp(format, "jfs") == 0) {
@@ -2397 +2398 @@
     } else if (strcmp(format, "ext3") == 0) {
         strcpy(program, "mkfs -t ext3 -F -q");
+    } else if (strcmp(format, "ext4") == 0) {
+        strcpy(program, "mkfs -t ext4 -F -q");
     } else if (strcmp(format, "minix") == 0) {
         strcpy(program, "mkfs.minix");

branches/2.2.8/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -535 +535 @@
             update_progress_form(tmp);
             strcpy(format, mountlist->el[lino].format);
-            /* BERLIOS: removed as it doen't make sens to not mount ext3 partitions as ext3
-            if (!strcmp(format, "ext3")) {
-                strcpy(format, "ext2");
-            }
-            */
             res = mount_device(mountlist->el[lino].device,
                        mountlist->el[lino].mountpoint,

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

@@ -644 +644 @@
     /*  if (restore_some || restore_all || */
     if (ask_me_yes_or_no
-        ("Label/Identify your ext2 and ext3 partitions if necessary?")) {
+        ("Label/Identify your ext2/ext3/ext4 partitions if necessary?")) {
         mvaddstr_and_log_it(g_currentY, 0,
-                            "Using tune2fs to identify your ext2,3 partitions");
+                            "Using tune2fs to identify your ext2,3,4 partitions");
         if (does_file_exist("/tmp/fstab.new")) {
             strcpy(fstab_fname, "/tmp/fstab.new");

branches/2.2.8/mondo/src/restore-scripts/mondo/hack-fstab

@@ -22 +22 @@
     label=`echo "$incoming"      | cut -d' ' -f5`
     original_fstab_line=`grep " $mountpoint " $old_fstab | grep -v "#" | tr -s ' ' ' '`
-    if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
+    if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] || [ "$format" = "ext4" ]; then
         if [ "`echo "$original_fstab_line" | grep "LABEL="`" != "" ] ; then
             device="LABEL=$label"

branches/2.2.8/mondo/src/restore-scripts/mondo/label-partitions-as-necessary

@@ -27 +27 @@
         LogIt "Not labeling ($mountpt) as anything because ($label) is not a label"
     else
-        if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
+        if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] || [ "$format" = "ext4" ]; then
             command="tune2fs $opttun $label $mountpt"
             LogIt "Running $command"