Changeset 3336


Ignore:
Timestamp:
Jan 26, 2015, 10:30:36 AM (4 years ago)
Author:
bruno
Message:
  • Backport from 3.2 remaining additoinal support for recent Fedora, btrfs, ...)
Location:
branches/3.0/mindi
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/mindi/analyze-my-lvm

    r3319 r3336  
    7575    fi
    7676
    77     echo "# $LVMCMD lvcreate$params -n $logical_volume $volume_group"
     77    echo "# echo y | $LVMCMD lvcreate$params -n $logical_volume $volume_group"
    7878}
    7979
  • branches/3.0/mindi/mindi

    r3332 r3336  
    576576#       LogFile "INFO: '$incoming' generates filelist '$filelist'"
    577577        for fname in $filelist ; do
    578             [ "$fname" != "" ] && echo "$fname" >> $tempfile
     578            [ "$fname" != "" ] && echo "$fname" >> $tempfile
    579579        done
    580580        progress=$(($progress+1))
     
    895895                LogFile "          This warning only affects you if you are using LVM."
    896896                if echo "$MODULES" | grep lvm &> /dev/null ; then
    897                     LogFile "          I think you are, so please take heed!"
     897                    LogFile "          I think you are, so please take heed!"
    898898                else
    899                     LogFile "          I don't think you are, so don't worry about it."
     899                    LogFile "          I don't think you are, so don't worry about it."
    900900                fi
    901901            fi
     
    14371437            label="$uuid"
    14381438        fi
     1439
     1440        # On RHEL 7 they use UUID concretely, even when not mentioned in fstab
     1441        # in order to mount the root part e.g. in grub.
     1442        # One way to solve this is to add the UUID now, if there wasn't one so it's
     1443        # restored correctly
     1444        if [ _"$label" = _"" ]; then
     1445            label=`blkid $current_partition | perl -p -e 's/.* UUID="([A-z0-9-]+)" .*/$1/'`
     1446        fi
     1447
    14391448        partition_format="`echo "$partition_format" | cut -d',' -f1`"; # in case user has ext3,ext2 or something dumb like that
    14401449        [ "$partition_format" = "auto" ] && partition_format="`mount | grep -w $current_partition | $AWK '{print$5;}'`"; # in case user uses 'auto' (dumb!)
     
    21762185        Die "You have $res files present in dependency list\nbut absent from filesystem."
    21772186    fi
    2178     FindAndAddUserKeyboardMappingFile
    21792187    mkdir -p $bigdir/tmp
    21802188    if [ _"$MONDO_SHARE" != _"" ]; then
     
    21822190        cp -f $MINDI_TMP/mondo-restore.cfg $bigdir/tmp &> /dev/null
    21832191    fi
     2192
     2193    # Needs to be done after the MRCFG creation
     2194    FindAndAddUserKeyboardMappingFile
     2195
    21842196    [ -d "/mnt/.boot.d" ] && echo "GENTOO" > $bigdir/tmp/DUMBASS-GENTOO
    21852197    DropOptimizedLibraries $needlist $bigdir
     
    25642576    cd "$mountpoint"
    25652577
     2578    # Check whether /lib64 or /lib or /sbin or /bin is a link and if so explicitly create one in rootfs (Fedora 17 crazyness)
     2579    for d in bin sbin lib lib64; do
     2580        if [ -h "/$d" ]; then
     2581            thelink=`readlink /$d`
     2582            mkdir -p $mountpoint/$thelink || LogIt "ERROR: Unable to create $thelink in $mountpoint."
     2583            mv $mountpoint/$d/* $mountpoint/$d/.??* $mountpoint/$thelink 2> /dev/null
     2584            if [ -d "$mountpoint/$d" -a ! -h "$mountpoint/$d" ]; then
     2585                rmdir $mountpoint/$d
     2586            fi
     2587            if [ ! -h $mountpoint/$d ]; then
     2588                rm -f $mountpoint/$d 2> /dev/null
     2589                (cd $mountpoint ; ln -s $thelink $d) || LogIt "ERROR: /$d is a symbolic link, but I couldn't create it in $mountpoint."
     2590            fi
     2591        fi
     2592    done
     2593    LogFile "INFO: what is now in $mountpoint"
     2594    ls -alR $mountpoint >> $LOGFILE
    25662595   
    25672596    # Check files before copying to discover configuration issues or McAfee preventing mindi reading these files
     
    30933122    MODULES="$MODULES `/usr/sbin/esxcfg-module -l | $AWK '{print $1}'`"
    30943123fi
    3095 LogFile "Liste of extra modules is:"
    3096 LogFile "-------------"
    3097 LogFile "$EXTRA_MODS"
    30983124LogFile "-------------"
    30993125LogFile "FORCE_MODS:"
  • branches/3.0/mindi/parted2fdisk.pl

    r3143 r3336  
    152152        "ext4" => "83",
    153153        "xfs" => "83",
     154        "btrfs" => "83",
    154155        "reiserfs" => "83",
    155156        "linux-swap" => "82",
Note: See TracChangeset for help on using the changeset viewer.