Changeset 3008


Ignore:
Timestamp:
May 15, 2012, 6:13:10 PM (7 years ago)
Author:
bruno
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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/mindi/deplist.d/fs.conf

    r2943 r3008  
    3737/sbin/btrfsck
    3838
    39 # ext2/3
     39# ext2/3/4
    4040#
    4141/sbin/e2label
     42/sbin/e4label
    4243/sbin/tune2fs
     44/sbin/tune4fs
    4345/etc/mke2fs.conf
    4446
  • branches/3.0/mindi/mindi

    r3007 r3008  
    27242724    gvFileSystem=`GetInitrdFilesystemToUse ${kernelpath}`
    27252725    [ -z  gvFileSystem ] && Die "GetFilesystemToUse() failed. Terminating."
    2726     if [ "$gvFileSystem" = "ext2fs" ] || [ "$gvFileSystem" = "ext3fs" ]; then
     2726    if [ "$gvFileSystem" = "ext2fs" ] || [ "$gvFileSystem" = "ext3fs" ] || [ "$gvFileSystem" = "ext4fs" ]; then
    27272727        # say what will be used
    27282728        LogFile "INFO: Creating an $gvFileSystem initrd image..."
     
    27322732        umount $mountpoint || Die "Cannot unmount $tempfile"
    27332733        dd if=$tempfile bs=1k 2> /dev/null > ${rdz_fname}.tmp 2> /dev/null
    2734         bs=`tune2fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2 | sed 's/^ *//'`
     2734        if [ "$gvFileSystem" = "ext4fs" ] && [ -x "/sbin/tune4fs" ]; then
     2735            bs=`/sbin/tune4fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2 | sed 's/^ *//'`
     2736        else
     2737            bs=`tune2fs -l ${rdz_fname}.tmp | grep -E '^Block size:' | cut -d: -f2 | sed 's/^ *//'`
     2738        fi
    27352739        MINDI_ADDITIONAL_BOOT_PARAMS="$MINDI_ADDITIONAL_BOOT_PARAMS ramdisk_blocksize=$bs"
    27362740        gzip -c9 ${rdz_fname}.tmp > $rdz_fname
  • branches/3.0/mondo/src/mondorestore/mondorestore.c

    r3002 r3008  
    653653        ("Label/Identify your ext2/ext3/ext4 partitions if necessary?")) {
    654654        mvaddstr_and_log_it(g_currentY, 0,
    655                             "Using tune2fs to identify your ext2,3,4 partitions");
     655                            "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
    656656        if (does_file_exist("/tmp/fstab.new")) {
    657657            strcpy(fstab_fname, "/tmp/fstab.new");
     
    888888    mvaddstr_and_log_it(g_currentY,
    889889                        0,
    890                         "Using tune2fs to identify your ext2,3 partitions");
     890                        "Using tune2fs/tune4fs to identify your ext2,3 partitions");
    891891
    892892    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

    r2172 r3008  
    2828    else
    2929        if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] || [ "$format" = "ext4" ]; then
    30             command="tune2fs $opttun $label $mountpt"
     30            if [ "$format" = "ext4" ] && [ -x "/sbin/tune4fs" ]; then
     31                command="/sbin/tune4fs $opttun $label $mountpt"
     32            else
     33                command="tune2fs $opttun $label $mountpt"
     34            fi
    3135            LogIt "Running $command"
    3236            $command
     
    4549            fi
    4650        else
    47             LogIt "I am NOT going to run tune2fs/reiserfstune: the partition is format '$format', which doesn't like tune2fs/reiserfstune anyway"
     51            LogIt "I am NOT going to run tune2|4fs/reiserfstune: the partition is format '$format', which doesn't like tune2|4fs/reiserfstune anyway"
    4852        fi
    4953    fi
     
    5357# ---------------------------------------------
    5458
    55 LogIt "Identifying your drives with tune2fs"
     59LogIt "Identifying your drives with FS tune tool"
    5660if [ "$#" -ne "1" ] ; then
    5761    LogIt "label-partitions-as-necessary /tmp/mountlist.txt < /tmp/fstab.new" 1
Note: See TracChangeset for help on using the changeset viewer.