Changeset 3008 in MondoRescue

Timestamp:

May 15, 2012, 6:13:10 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix #618 by adding support for new command tune4fs for labelling ext4 FS (needed on RHEL 5.6 at least)

Location:

branches/3.0

Files:

• mindi/deplist.d/fs.conf (modified) (1 diff)
• mindi/mindi (modified) (2 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (2 diffs)
• mondo/src/restore-scripts/mondo/label-partitions-as-necessary (modified) (3 diffs)

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

@@ -37 +37 @@
 /sbin/btrfsck
 
-# ext2/3
+# ext2/3/4
 #
 /sbin/e2label
+/sbin/e4label
 /sbin/tune2fs
+/sbin/tune4fs
 /etc/mke2fs.conf
 

branches/3.0/mindi/mindi

@@ -2724 +2724 @@
     gvFileSystem=`GetInitrdFilesystemToUse ${kernelpath}`
     [ -z  gvFileSystem ] && Die "GetFilesystemToUse() failed. Terminating."
-    if [ "$gvFileSystem" = "ext2fs" ] || [ "$gvFileSystem" = "ext3fs" ]; then
+    if [ "$gvFileSystem" = "ext2fs" ] || [ "$gvFileSystem" = "ext3fs" ] || [ "$gvFileSystem" = "ext4fs" ]; then
         # say what will be used
         LogFile "INFO: Creating an $gvFileSystem initrd image..."
@@ -2732 +2732 @@
         umount $mountpoint || Die "Cannot unmount $tempfile"
         dd if=$tempfile bs=1k 2> /dev/null > ${rdz_fname}.tmp 2> /dev/null
-        bs=`tune2fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2 | sed 's/^ *//'`
+        if [ "$gvFileSystem" = "ext4fs" ] && [ -x "/sbin/tune4fs" ]; then
+            bs=`/sbin/tune4fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2 | sed 's/^ *//'`
+        else
+            bs=`tune2fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2 | sed 's/^ *//'`
+        fi
         MINDI_ADDITIONAL_BOOT_PARAMS="$MINDI_ADDITIONAL_BOOT_PARAMS ramdisk_blocksize=$bs"
         gzip -c9 ${rdz_fname}.tmp > $rdz_fname

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

@@ -653 +653 @@
         ("Label/Identify your ext2/ext3/ext4 partitions if necessary?")) {
         mvaddstr_and_log_it(g_currentY, 0,
-                            "Using tune2fs to identify your ext2,3,4 partitions");
+                            "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
         if (does_file_exist("/tmp/fstab.new")) {
             strcpy(fstab_fname, "/tmp/fstab.new");
@@ -888 +888 @@
     mvaddstr_and_log_it(g_currentY,
                         0,
-                        "Using tune2fs to identify your ext2,3 partitions");
+                        "Using tune2fs/tune4fs to identify your ext2,3 partitions");
 
     sprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", g_mountlist_fname, MONDO_LOGFILE, MONDO_LOGFILE);

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

@@ -28 +28 @@
     else
         if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] || [ "$format" = "ext4" ]; then
-            command="tune2fs $opttun $label $mountpt"
+            if [ "$format" = "ext4" ] && [ -x "/sbin/tune4fs" ]; then
+                command="/sbin/tune4fs $opttun $label $mountpt"
+            else
+                command="tune2fs $opttun $label $mountpt"
+            fi
             LogIt "Running $command"
             $command
@@ -45 +49 @@
             fi
         else
-            LogIt "I am NOT going to run tune2fs/reiserfstune: the partition is format '$format', which doesn't like tune2fs/reiserfstune anyway"
+            LogIt "I am NOT going to run tune2|4fs/reiserfstune: the partition is format '$format', which doesn't like tune2|4fs/reiserfstune anyway"
         fi
     fi
@@ -53 +57 @@
 # ---------------------------------------------
 
-LogIt "Identifying your drives with tune2fs"
+LogIt "Identifying your drives with FS tune tool"
 if [ "$#" -ne "1" ] ; then
     LogIt "label-partitions-as-necessary /tmp/mountlist.txt < /tmp/fstab.new" 1