Changeset 1886 for branches/stable


Ignore:
Timestamp:
Mar 2, 2008, 12:40:00 AM (11 years ago)
Author:
bruno
Message:
  • Align mindi stable with version 2.2.5 (remaining part is now conf file)
Location:
branches/stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/mindi

    r1842 r1886  
    1717
    1818#RUN_AFTER_INITIAL_BOOT_PHASE="echo \"Who lives in a pineapple under the sea?\" > /tmp/spongebob.squarepants.txt"
    19     # after booting from image/CD image but before
     19    # after booting from image/CD but before
    2020    # accessing auxiliary data disks (or the rest of
    2121    # the CD), the initscript will run the above command.
     
    587587    done
    588588    if [ ! -e "$mappath" ] || [ -d "$mappath" ] ; then
    589        mappath=$(locate */kbd/keymaps/*/$locale)
     589            mappath=$(find / -name "*/kbd/keymaps/*/$locale")
    590590    fi
    591591    echo "mappath = $mappath" >> $LOGFILE
     
    612612    [ ! -e "$ISOLINUX" ] && ISOLINUX=/usr/share/lib/syslinux/isolinux.bin
    613613    [ ! -e "$ISOLINUX" ] && ISOLINUX=/usr/share/lib64/syslinux/isolinux.bin
    614     [ ! -e "$ISOLINUX" ] && ISOLINUX=`locate isolinux.bin | grep -x "/.*/isolinux.bin"`
     614    [ ! -e "$ISOLINUX" ] && ISOLINUX=`find / -name isolinux.bin | grep -x "/.*/isolinux.bin"`
    615615    [ ! -e "$ISOLINUX" ] && Die "Please install isolinux first. If your syslinux RPM doesn't include isolinux, you may download an isolinux RPM from Mondo's website - go to http://www.mondorescue.com and click on 'Download'"
    616616    echo "Found isolinux.bin at $ISOLINUX" >> $LOGFILE
     
    778778    progress=0
    779779    noof_lines=`cat $tempfile | wc -l`
     780    echo "---------------------------------" >> $LOGFILE
     781    echo "List of dependencies:             " >> $LOGFILE
     782    echo "---------------------------------" >> $LOGFILE
    780783    for fname in `cat $tempfile` ; do
    781         echo "$fname" >> $outfile.pre
    782         LocateDeps $fname >> $outfile.pre
     784        echo "$fname" | tee -a $LOGFILE >> $outfile.pre
     785        LocateDeps $fname | tee -a $LOGFILE >> $outfile.pre
    783786        progress=$(($progress+1))
    784787        echo -en "\r\t\t\t\t\t\t\t\t"
     
    811814            LogIt "If Mindi was called by Mondo then send me a bug report.\n It not, type 'ps ax' to see which Mondo-related process is still running;\n then kill it. :-)\n Finally, run Mindi again."
    812815            Die "Odd."
     816        fi
     817        cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2> /dev/null || LogIt "\nMondo v1.2x defaults to LILO as the bootloader, BTW."
     818        if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
     819            LogIt "Incorporating NFS-related settings"
     820            for r in NFS-* ISO-PREFIX ; do
     821                cp -f $MINDI_TMP/$r $bigdir/tmp 2>> $LOGFILE || Die "Cannot copy $r - did you run out of disk space?"
     822                echo "Copying $r to ramdisk" >> $LOGFILE
     823            done
    813824        fi
    814825    fi
     
    10391050    file="$1"
    10401051
     1052    echo "$file"
    10411053    if [ ! -h $file ]; then
    1042         echo "$file"
    10431054        return 0
    10441055    fi
    10451056
    1046     link=`readlink -f $file`
     1057    link=`readlink $file`
    10471058    d=`dirname $file`
    1048     if [ ! -e "$link" -a ! -e "$d/$link" ]; then
    1049         echo "Problem with dead link on $file -> $link" >> $LOGFILE
    1050     fi
     1059    fchar=`echo $link | cut -c1`
     1060    # If mother dir is a link print it
    10511061    if [ -h "$d" ]; then
    1052         echo "$link"
    10531062        echo "$d"
    1054     else
    1055         echo "$link"
     1063        d=`readlink $d`
     1064    fi
     1065    if [ "$fchar" != "/" ]; then
     1066        # Relative or local link
     1067        ReadAllLink "$d/$link"
     1068    else
     1069        # Absolute path
     1070        ReadAllLink $link
    10561071    fi
    10571072}
     
    13631378            fi
    13641379        else
    1365             str_to_find_fmt_with=$current_partition
     1380            # Needs to handle the recent OpenSUSE fancy way of dealing with fstab :-(
     1381            # they use symlinks in fstab unrelated to what is shown in mount !
     1382            if [ _"$partition_mountpt" = _"" ]; then
     1383                for tmpp in `tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -Ev "^#" | $AWK '{print $1}'`; do
     1384                        if [ _"`readlink -f $tmpp`" = _"$current_partition" ]; then
     1385                            str_to_find_fmt_with=$tmpp
     1386                            partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -w "$tmpp" | /bin/grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
     1387                            break;
     1388                        fi
     1389                done
     1390            else
     1391                str_to_find_fmt_with=$current_partition
     1392            fi
    13661393        fi
    13671394
     
    14481475        if [ ! "$partition_mountpt" ] ; then
    14491476            echo "------- $FDISK -l $qq log ------------" >> $LOGFILE
    1450             for qq in "" `find /dev/ida/c*d* ! -name '*p*'` ; do
     1477            for qq in "" `find /dev/ida/c*d* ! -name '*p*' 2> /dev/null`; do
    14511478                partition_format=`$FDISK -l $qq 2>> $LOGFILE | grep -w "$c_p" | sed 's/12/|/' | tr -s '\t' ' ' | cut -d'|' -f2 | cut -d' ' -f2-9`
    14521479                [ "$partition_format" ] && break
     
    15931620    done
    15941621    MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
    1595     cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/iso/isolinux/vmlinuz). Did you run out of disk space?"
     1622    cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/iso/isolinux/vmlinuz). Did you run out of disk space?"
    15961623    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img 2>> $LOGFILE
    15971624    if [ _"$MONDO_SHARE" != _"" ]; then
    1598         cp $kernelpath $MONDO_ROOT/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
    1599         cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2> /dev/null || Die "Cannot copy mindi.rdz ($MINDI_TMP/mindi.rdz) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
     1625        cp $kernelpath $MONDO_ROOT/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"/dev/null
     1626        cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2>> $LOGFILE || Die "Cannot copy mindi.rdz ($MINDI_TMP/mindi.rdz) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
    16001627
    16011628    fi
     
    16591686    echo "Transforming $USBDEVICE in a Bootable device"  >> $LOGFILE
    16601687    echo "Checking $USBDEVICE" >> $LOGFILE
    1661     $FDISK -l $USBDEVICE 2>&1 >> $LOGFILE
     1688    $FDISK -l $USBDEVICE 2>> $LOGFILE 1>> $LOGFILE
    16621689    if [ $? -ne 0 ]; then
    16631690        echo "Unable to access $USBDEVICE" | tee -a $LOGFILE
     
    25782605
    25792606TurnTgzIntoRdz() {
    2580     local tgz_dir_fname rdz_fname ramdisksize tempfile mountpoint old_pwd nodes kernelsize maxsize res currsize not_copied j k s w
     2607    local tgz_dir_fname rdz_fname ramdisksize tempfile mountpoint old_pwd nodes kernelsize maxsize res currsize not_copied j k s w needed_modules_path
    25812608
    25822609    tgz_dir_fname=$1
     
    26172644    [ -e "/dev/.devfsd" ] && echo "/dev/.devfsd found" > tmp/USE-DEVFS
    26182645
    2619     # Handle the case where busybox is dynamically linked
     2646    # Handle the case where busybox and mount are dynamically linked
    26202647    # Should be done first so that if /lib64 is a link, it's
    26212648    # created first like that, instead of as a real dir later on
    26222649    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically"
    26232650    if [ $? -eq 0 ]; then
    2624         LocateDeps $MINDI_LIB/rootfs/bin/busybox > $MINDI_TMP/busy.lis
     2651        LocateDeps $MINDI_LIB/rootfs/bin/busybox /bin/mount > $MINDI_TMP/busy.lis
    26252652        cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
    26262653        rm -f $MINDI_TMP/busy.lis
     
    26762703        LogIt "Hardware Information found and saved ..."
    26772704        cp -rp $MINDI_CACHE/bkphw .
    2678         lis=`grep -Ev '^#' $MINDI_CACHE/tools.files`
    2679         LocateDeps $lis > $MINDI_TMP/tools.lis
    2680         cp --parents -Rdf $lis `sort -u $MINDI_TMP/tools.lis` .
     2705        if [ -f $MINDI_CACHE/tools.files ]; then
     2706            lis=`grep -Ev '^#' $MINDI_CACHE/tools.files`
     2707            LocateDeps $lis > $MINDI_TMP/tools.lis
     2708            cp --parents -Rdf $lis `sort -u $MINDI_TMP/tools.lis` .
     2709        fi
    26812710        if [ -f $MINDI_CACHE/mindi-rsthw ]; then
    26822711            mv -f $MINDI_CACHE/mindi-rsthw .
     
    27182747    needed_modules=""
    27192748    list_of_groovy_mods="$CDROM_MODS $FORCE_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     2749
    27202750    if [ "$NFS_DEV" != "" ] ; then
    27212751        # For PXE boot
     
    27752805    mkdir -p $mountpoint/proc
    27762806    echo "$BOOT_SIZE" > $mountpoint/tmp/$BOOT_SIZE.siz
    2777     find $mountpoint -name CVS -exec rm -rf '{}' \;
    27782807    # Determine what filesystem to use for initrd image
    27792808    echo "Call GetInitrdFilesystemToUse() with parameter ${kernelpath} to get filesystem to use for initrd." >> $LOGFILE
     
    28752904##############################################################################
    28762905
    2877 # Now we can create what we nedd
     2906# Now we can create what we need
    28782907mkdir -p $MINDI_TMP
    28792908
     
    28842913rm -rf $MINDI_CACHE/* 2> /dev/null
    28852914mkdir -p $MINDI_CACHE
    2886 
    28872915
    28882916if [ "$1" = "--printvar" ] ; then
     
    29152943[ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
    29162944echo "MINDI_CONF = $MINDI_CONF" >> $LOGFILE
    2917 if [ -f $MINDI_CONF ]; then
     2945if [ -f $MINDI_CONFIG ]; then
    29182946    echo "-----------------------------" >> $LOGFILE
    29192947    echo " Mindi configuration file    " >> $LOGFILE
    29202948    echo "-----------------------------" >> $LOGFILE
    2921     grep -Ev '^#' $MINDI_CONF >> $LOGFILE
     2949    grep -Ev '^#' $MINDI_CONFIG >> $LOGFILE
    29222950    echo "-----------------------------" >> $LOGFILE
    29232951fi
     
    30603088    MODULES="$MODULES `/usr/sbin/esxcfg-module -l | awk '{print $1}'`"
    30613089fi
     3090echo "FORCE_MODS:" >> $LOGFILE
     3091echo "-------------" >> $LOGFILE
     3092echo $FORCE_MODS >> $LOGFILE
     3093echo "-------------" >> $LOGFILE
     3094echo "DENY_MODS:" >> $LOGFILE
     3095echo "-------------" >> $LOGFILE
     3096echo $DENY_MODS >> $LOGFILE
    30623097echo "-------------" >> $LOGFILE
    30633098echo "df result:" >> $LOGFILE
     
    33053340    echo -en "Would you like to use LILO (instead of syslinux)\nfor your boot image (y/[n]) ?"
    33063341    read ch
    3307     if [ "$ch" = "y" ] || [ "$ch" = "Y" ] ; then
     3342    if [ "$ch" != "y" ] && [ "$ch" != "Y" ] ; then
     3343        USE_LILO=no
     3344    else
    33083345        USE_LILO=yes
    33093346    fi
  • branches/stable/pbconf/mondorescue.pb

    r1842 r1886  
    1212# Which CMS system is used
    1313#
    14 cms mondorescue = svn
     14pburl mondorescue = svn+ssh://bruno@svn.mondorescue.org/mondo/svn/mondorescue
    1515
    1616#
    1717# Packager label
    1818#
    19 packager mondorescue = "Bruno Cornec <bruno@mondorescue.org>"
     19pbpackager mondorescue = "Bruno Cornec <bruno@mondorescue.org>"
    2020
    2121#
     
    3535# a QEMU rhel_3 here means that the VM will be named rhel_3.qemu
    3636#
    37 vmlist mondorescue = mandrake_10.1,mandrake_10.2,mandriva_2006.0,mandriva_2007.0,mandriva_2007.1,mandriva_2008.0,redhat_7.3,redhat_9,fedora_4,fedora_5,fedora_6,fedora_7,fedora_8,rhel_2.1,rhel_3,rhel_4,rhel_5,suse_10.0,suse_10.1,suse_10.2,suse_10.3,sles_9,sles_10,debian_3.1,debian_4.0,ubuntu_6.06,ubuntu_7.04,ubuntu_7.10,gentoo_nover,slackware_10.2,slackware_11.0,freebsd_5.5
     37vmlist mondorescue = mandrake-10.1-i386,mandrake-10.2-i386,mandriva-2006.0-i386,mandriva-2007.0-i386,mandriva-2007.1-i386,mandriva-2008.0-i386,redhat-7.3-i386,redhat-9-i386,fedora-4-i386,fedora-5-i386,fedora-6-i386,rhel-3-i386,rhel-4-i386,rhel-5-i386,suse-10.0-i386,suse-10.1-i386,suse-10.2-i386,suse-10.3-i386,sles-9-i386,sles-10-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,mandriva-2007.0-x86_64,mandriva-2007.1-x86_64,mandriva-2008.0-x86_64,fedora-6-x86_64,fedora-8-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,suse-10.3-x86_64,sles-10-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64
     38
     39# List of  VEs
     40velist mondorescue = fedora-7-i386
     41
     42#
     43# Valid values for vetype are
     44# chroot (maybe others in the future)
     45vetype mondorescue = chroot
    3846
    3947#
     
    5765
    5866testver mondorescue = true
    59 projver mondorescue = stable
     67projver mondorescue = branches/stable
    6068projtag mondorescue = 1
    6169
     
    7381
    7482# Hash of valid version names
    75 version devel
    76 version stable
     83version mondorescue = devel,stable,trunk
    7784
    7885# List of additional files on which to apply filters
Note: See TracChangeset for help on using the changeset viewer.