Changeset 3008 in MondoRescue for branches/3.0/mindi/mindi

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)

File:

• branches/3.0/mindi/mindi (modified) (2 diffs)

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