Changeset 2445


Ignore:
Timestamp:
Oct 2, 2009, 4:30:07 AM (9 years ago)
Author:
bruno
Message:

r3513@localhost: bruno | 2009-10-02 00:09:16 +0200

  • Not using busybox for mindi anymore (start - step needed for tests)
Location:
branches/2.2.10
Files:
4 added
5 deleted
14 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.10/mindi/deplist.d/base.conf

    r2444 r2445  
    11# $Id$
    22#
    3 # Base System Tools that are mandatory inside the initrd
     3# Base System Tools that are mandatory inside the data disk
    44#
     5#
     6# Conf files
    57/etc/fstab
    68/etc/modules.conf
     
    1214/etc/nsswitch.conf
    1315
     16# Mondorescue requirements
    1417/usr/sbin/mondorestore
    1518/usr/bin/afio
    1619/usr/bin/star
    1720/usr/sbin/ntfsclone
    18 /usr/bin/buffer
    1921
     22# HW
    2023/usr/sbin/parted
    2124/sbin/parted
    2225/usr/sbin/partprobe
    2326
     27# File
    2428/usr/bin/file
    2529/usr/share/misc/file/magic
    2630/usr/share/file/magic
    2731
     32# ACLs
    2833/usr/bin/getfattr
    2934/usr/bin/setfattr
     
    3136/usr/bin/setfacl
    3237
     38# Compressors
    3339/usr/bin/bzip2
    3440# is a link => No additional place
     
    3743/usr/bin/lzma
    3844
    39 /bin/bash
    40 /bin/date
     45# Unix commands
     46/bin/chroot
     47/usr/sbin/chroot
     48/usr/bin/cmp
    4149/sbin/ctrlaltdel
    4250/bin/dd
    4351/usr/bin/eject
     52/usr/bin/env
     53/sbin/halt
     54/sbin/ldconfig
    4455/usr/bin/wc
     56
     57# Status ???
     58#
     59/usr/bin/du
    4560/usr/bin/xargs
     61/usr/bin/head
    4662/usr/bin/less
    47 /sbin/ldconfig
     63/usr/bin/sort
     64/usr/bin/uniq
     65/usr/bin/reset
     66
    4867
    4968# For swap uuid support, ia64 and probably then more in the future
  • branches/2.2.10/mindi/deplist.d/minimal.conf

    r2444 r2445  
    77
    88# Base Unix commands
    9 /bin/mt
     9# Used by init
     10/bin/sh
    1011/bin/awk
     12/usr/bin/awk
    1113/bin/gawk
    12 /bin/dd
    1314/bin/grep
    1415/bin/uname
     
    1617/usr/bin/loadkeys
    1718/sbin/pidof
     19/sbin/reboot
     20/sbin/openvt
     21/usr/bin/tail
     22/usr/bin/which
     23/usr/bin/strings
     24/usr/bin/test
     25/usr/bin/[
     26/usr/bin/tr
     27/usr/bin/cut
     28/usr/bin/basename
     29/usr/bin/find
     30/bin/stty
     31/bin/echo
     32/bin/mknod
     33/bin/kill
     34/bin/date
     35/bin/cat
     36/bin/ls
     37/bin/ps
     38/bin/umount
     39/bin/dmesg
     40/bin/ln
     41/bin/pwd
     42/bin/grep
     43/bin/vi
     44/bin/mv
     45/bin/chmod
     46/bin/more
     47/bin/[
     48/bin/true
     49/bin/sed
     50/bin/touch
     51/bin/rmdir
     52/bin/cp
     53/bin/tar
     54/bin/rm
     55/bin/mkdir
     56/bin/sleep
     57/bin/uname
    1858
    1959# Compression
     
    2767/sbin/fdisk
    2868/sbin/hdparm
     69
     70# FS related
    2971/bin/mount
    30 /sbin/mount.nfs
    31 /sbin/mount.nfs4
    32 /usr/bin/sshfs
    33 /sbin/mount.fuse
    34 /usr/bin/fusermount
    35 /usr/bin/ssh
    36 # Required by ssh as dlopened
    37 /usr/lib/libnss_compat.so
    38 /usr/lib64/libnss_compat.so
    39 /usr/lib/libnss_files.so
    40 /usr/lib64/libnss_files.so
    41 /etc/ssh
    42 /usr/bin/ulockmgr_server
    43 /sbin/mount.cifs
    44 /sbin/mount.cifs3
    45 /sbin/mount.smb
    46 /sbin/mount.smb3
    47 /sbin/mount.smbfs
    48 /sbin/mount.smbfs3
     72/sbin/losetup
    4973/sbin/mount.ntfs
    5074/sbin/mount.ntfs-3g
     
    102126/sbin/mpath_prio_tpc
    103127
    104 # Network System Tools
    105 /bin/ping
    106 /sbin/ifconfig
    107 /sbin/route
    108 /sbin/dhclient
    109 /var/lib/dhcp/dhclient.leases
    110 
    111 # Busybox
    112 /usr/lib/mindi/rootfs/bin/busybox
    113 /usr/lib64/mindi/rootfs/bin/busybox
     128# Not completely mandatory
     129/usr/bin/tty
  • branches/2.2.10/mindi/deplist.d/net.conf

    r2444 r2445  
    33# Network System Tools
    44#
     5# Base commands
     6/bin/netstat
    57
    68# SSH support
     
    1012# Useful for debug
    1113/usr/sbin/ethtool
     14
     15#/bin/hostname
     16#/sbin/hostname
     17#/usr/bin/tftp
  • branches/2.2.10/mindi/deplist.txt

    r2412 r2445  
    11# $Id$
     2#
     3# This file is for additional components needed on the data disk
     4#
    25#
    36# NB:
    47# 1. Directories are allowed. Their contents will be included by Mindi.
    5 # 2. If you put 'libncurses' (w/o quotation marks) on an uncommented line then
    6 #    Mindi will find /lib/libncurses* and include all matching files.
    7 # 3. You recommend that you give an absolute path name
    8 # 4. If you want to add something, just add it on its own line. K.I.S.S.
    9 # 5. You must _not_ put a semicolon & comment after an entry. e.g. 'foo; #bar'.
     8# 2. You have to give an absolute path name
     9# 3. If you want to add something, just add it on its own line. K.I.S.S.
     10# 4. You must _not_ put a semicolon & comment after an entry. e.g. 'foo; #bar'.
     11# 5. You can put comment like here or after a file to include
    1012
    1113#------------------------- STUFF ADDED BY THE USER ----------------------------
    1214#---vvvv     vvvv     vvvv  list your stuff here!  vvvv     vvvv     vvvv
    1315
    14 
    15 #---^^^^     ^^^^     ^^^^  list your stuff here!  ^^^^     ^^^^     ^^^^
    1616#------------------------------------------------------------------------------
  • branches/2.2.10/mindi/install.sh

    r2412 r2445  
    7676install -m 755 analyze-my-lvm $locallib/mindi
    7777install -m 644 msg-txt dev.tgz $locallib/mindi
    78 install -m 644 deplist.txt udev.files proliant.files $conf
     78install -m 644 deplist.conf deplist-minimal.conf udev.files proliant.files $conf
    7979for f in deplist.d/*.conf; do
    8080    install -m 644 $f $conf/deplist.d
     
    8989
    9090install -m 644 mindi.8 $MANDIR
    91 #install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL svn.log $DOCDIR
    92 
    93 if [ "_$PREFIX" = "_" ] && [ ! -f $locallib/mindi/rootfs/bin/busybox ]; then
    94     echo "WARNING: no busybox found, mindi will not work on this arch ($ARCH)"
    95 fi
     91#install -m 644 ChangeLog COPYING README README.ia64 README.pxe TODO INSTALL svn.log $DOCDIR
    9692
    9793# Managing parted2fdisk
  • branches/2.2.10/mindi/mindi

    r2444 r2445  
    3434TMPDIR=/tmp
    3535
    36 EXTRA_SPACE=49152       # increase if you run out of ramdisk space
     36EXTRA_SPACE=60000       # increase if you run out of ramdisk space
    3737BOOT_SIZE=16384         # size of the boot disk
    3838
     
    9292    . $MINDI_CONFIG
    9393fi
    94 DEPLIST_FILE="$MINDI_CONF/deplist.txt"
     94DEPLIST_FILE="$MINDI_CONF/deplist.conf"
     95DEPLIST_FILE_MIN="$MINDI_CONF/deplist-minimal.conf"
    9596DEPLIST_DIR="$MINDI_CONF/deplist.d"
    9697
     
    153154            return
    154155        fi
    155     else
    156         echo -en "`basename $mappath | tr '.' '#' | sed s/#kmap#gz// | sed s/#inc#gz//` " | tr '#' '.'
    157156    fi
    158157
     
    181180    local outdir incoming fname counter d found
    182181    outdir=$1
     182    noof_lines=$2
    183183    mkdir -p $outdir
    184184    incoming=`ReadLine`
    185     counter=0
     185    progress=0
    186186    while [ "$incoming" != "" ] ; do
    187187        # Non absolute file names should not arrive till here => skipped
     
    199199        done
    200200        if [ -d "$incoming" ] && [ ! -h "$incoming" ]; then
    201             find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir
     201            find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir 0
    202202        elif [ -e "$incoming" ] && [ $found = "false" ]; then
    203203            tar cf - -C / $incoming 2>> $MINDI_TMP/$$.log | (cd $outdir ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?" $MINDI_TMP/$$.log
     
    208208            fi
    209209            [ -x "$outdir" ] && StripExecutable $outdir "-$filename-"
    210             counter=$(($counter+1))
    211             if [ "$counter" -ge "5" ] ; then
    212                 counter=0
    213                 echo -en "."
    214             fi
     210            progress=$(($progress+1))
     211            LogProgress $progress $noof_lines
    215212        fi
    216213        incoming=`ReadLine`
     
    315312FindAndAddUserKeyboardMappingFile() {
    316313    local r res mapfile mappath included_item included_list keyfile mp locale
    317     LogAll "Analyzing your keyboard's configuration."
     314    LogFile "Analyzing your keyboard's configuration."
    318315    KEYDIR=/lib/kbd
    319316    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd     # Slackware
     
    326323        return 0
    327324    fi
     325    LogFile "Adding the following keyboard mapping tables: "
    328326    if [ -e "/etc/sysconfig/keyboard" ] ; then
    329327        LogFile "Red Hat-style config detected."
     
    337335    elif [ -e "/etc/console/boottime.kmap.gz" ] ; then
    338336        LogFile "Debian-style config detected."
    339         echo -en "Adding the following keyboard mapping tables: "
    340337        mkdir -p $bigdir/tmp
    341338        echo "/etc/console/boottime.kmap.gz" > $bigdir/tmp/KEYMAP-LIVES-HERE
     
    347344    elif [ -e "/etc/console-setup/boottime.kmap.gz" ] ; then
    348345        LogFile "Ubuntu-style config detected."
    349         echo -en "Adding the following keyboard mapping tables: "
    350346        mkdir -p $bigdir/tmp
    351347        echo "/etc/console-setup/boottime.kmap.gz" > $bigdir/tmp/KEYMAP-LIVES-HERE
     
    359355        keyfile=/etc/conf.d/keymaps
    360356    else
    361         echo -en "Searching for rc.config ..."
     357        LogAll "Searching for rc.config ..."
    362358        keyfile=`find /etc -name rc.config | head -n1`
    363359        if [ "$keyfile" = "" ] || [ ! -e "$keyfile" ] ; then
     
    385381    [ ! "$mp" ] && mp=`grep "i[3-8]86" $MINDI_TMP/keymaps.find | grep "$locale[^r][^/]" | grep -vx " *#.*"`
    386382    # If we have multiple keymaps then log it !!
    387     echo "$mp" | grep -q " "
     383    echo "$mp" | grep -q " " >> $LOGFILE
    388384    if [ $? -eq 0 ]; then
    389385        LogAll "WARNING: Multiple keymaps found: $mp"
     
    402398        return
    403399    fi
    404     echo -en "Adding the following keyboard mapping tables: "
    405400    mkdir -p $bigdir/tmp
    406401    echo "$mappath" > $bigdir/tmp/KEYMAP-LIVES-HERE
     
    731726ListKernelModulePaths() {
    732727    local module_list module fname oss r kern
     728    outfile=$1
     729    echo -en "Analyzing modules requirements"
    733730    oss="/root/oss/modules"
    734731    module_list="$MODULES"
     
    751748### Sq-Mod End
    752749###
     750    noof_lines=0
     751    for module in $module_list $EXTRA_MODS ; do
     752        noof_lines=$(($noof_lines+1))
     753    done
     754    progress=0
    753755    for module in $module_list $EXTRA_MODS ; do
    754756        r=`find /lib/modules/$kern -type f | grep "/${module}\..*o" | tail -n1`
    755757        LogFile "module $module --> $r"
    756         [ "$r" ] && echo "$r"
    757         [ -f "$oss" ] && find $oss | grep -F $module
    758     done
    759     find /lib/modules/$kern/modules.* -type f 2> /dev/null
    760     [ -f "$oss" ] && find $oss.* 2> /dev/null
     758        [ "$r" ] && echo "$r" >> $outfile
     759        [ -f "$oss" ] && find $oss | grep -F $module >> $outfile
     760        progress=$(($progress+1))
     761        LogProgress $progress $noof_lines
     762    done
     763    find /lib/modules/$kern/modules.* -type f 2> /dev/null >> $outfile
     764    [ -f "$oss" ] && find $oss.* 2> /dev/null >> $outfile
    761765}
    762766
     
    932936absolute_partition old_partition_fmt current_lvolume uname skip
    933937
     938    LogFile "------------------------------------"
    934939    LogFile "Your raw fstab file looks like this:"
    935940    LogFile "------------------------------------"
    936941    cat $MY_FSTAB >> $LOGFILE
     942    LogAll "-----------------------------------"
    937943    LogAll "Your mountlist will look like this:"
    938944    LogAll "-----------------------------------"
     
    952958   
    953959    if [ $LVM != "false" ]; then
    954         echo -en "Analyzing LVM...\n"
     960        LogFile "Analyzing LVM..."
    955961        $MINDI_LIB/analyze-my-lvm > $MINDI_TMP/lvm.res
    956962        if [ $? -ne 0 ]; then
     
    965971    done
    966972    [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`"
    967     printf "        %-15s %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL/UUID | tee -a $LOGFILE
     973    printf "%-15s %-15s %-15s %-15s %15s\n" DEVICE MOUNTPOINT FORMAT "SIZE MB" LABEL/UUID | tee -a $LOGFILE
     974    printf "%-15s %-15s %-15s %-15s %15s\n" ------ ---------- ------  -------  ---------- | tee -a $LOGFILE
    968975    useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1"
    969976    for c_p in $all_partitions ; do
     
    12551262        partition_format="`echo "$partition_format" | cut -d',' -f1`"; # in case user has ext3,ext2 or something dumb like that
    12561263        [ "$partition_format" = "auto" ] && partition_format="`mount | grep -w $current_partition | $AWK '{print$5;}'`"; # in case user uses 'auto' (dumb!)
    1257         unofficial_outstring=`printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$label"`
     1264        unofficial_outstring=`printf "%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$label"`
    12581265        if [ "$current_partition" = "" ] ; then
    12591266            LogFile "Unknown partition (outstring = $unofficial_outstring)"
     
    12621269                partition_mountpt=raid
    12631270                partition_format=raid
    1264                 printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$label" | tee -a $LOGFILE
     1271                printf "%-15s %-15s %-15s %7s %15s\n" $current_partition $partition_mountpt $partition_format $psz "$label" | tee -a $LOGFILE
    12651272                printf "%s %s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$label" >> $mountlist
    12661273            else
     
    12781285                partition_format="vfat"
    12791286            fi
    1280             printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$label" | tee -a $LOGFILE
     1287            printf "%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$label" | tee -a $LOGFILE
    12811288            printf "%s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$label" >> $mountlist
    12821289        fi
    12831290    done
     1291    LogAll "-----------------------------------"
    12841292}
    12851293
     
    16821690        umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
    16831691        rmdir $mountpoint || LogAll "Cannot rmdir (PBDI)"
    1684     #   losetup /dev/loop0 -d
    16851692        [ "$imagefile" != "" ] && rm -f $imagefile
    16861693        return 0
     
    18411848    includefile=$MINDI_TMP/$$.includefile.txt
    18421849
     1850    lfiles=`ls $DEPLIST_DIR/* | grep -v /minimal`
    18431851    if [ -e "$DEPLIST_FILE" ]; then
    1844         lfiles="$DEPLIST_FILE $DEPLIST_DIR/*"
    1845     else
    1846         lfiles="$DEPLIST_DIR/*"
     1852        lfiles="$DEPLIST_FILE $lfiles"
    18471853    fi
    18481854    lines=`grep -vx " *#.*" $lfiles | grep -vx "" | wc -l`
     
    18551861        pwd=`pwd`
    18561862        cd $MINDI_TMP
    1857         for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
     1863        rm -f lkm.lis
     1864        ListKernelModulePaths lkm.lis
     1865        for i in `cat lkm.lis | HackPathsToFailsafe` ; do
    18581866            tar cf - ./$i 2>> $MINDI_TMP/$$.log | (cd $bigdir ; tar xf -) || Die "PDDI can't copy $i->$bigdir" $MINDI_TMP/$$.log
    18591867        done
     1868        rm -f lkm.lis
    18601869        for i in $EXTRA_MODS ; do
    18611870            j=`find lib/modules/$FAILSAFE_KVER -name $i.*o.gz 2> /dev/null`
     
    18681877        cd $pwd
    18691878    else
    1870         ListKernelModulePaths >> $needlist
     1879        # This function appends to the file passed in param
     1880        ListKernelModulePaths $needlist
    18711881    fi
    18721882    if [ "$res" -ne "0" ] ; then
     
    18821892    DropOptimizedLibraries $needlist $bigdir
    18831893    echo -en "Assembling dependency files"
    1884     CopyDependenciesToDirectory < $needlist $bigdir
     1894
     1895    CopyDependenciesToDirectory < $needlist $bigdir `wc -l $needlist`
    18851896
    18861897    # also copy io.sys and msdos.sys, if we can find them
     
    21962207    res=0
    21972208    echo -en "..."
    2198     dd if=/dev/zero of=$tempfile bs=1k count=$ramdisk_size &> /dev/null || Die "Not enough room for temporary ramdisk (TurnTgzIntoRdz)"
     2209    dd if=/dev/zero of=$tempfile bs=1k count=$ramdisk_size &> /dev/null || Die "Not enough room for temporary ramdisk ($tempfile)"
    21992210    echo -en "..."
    22002211    LogFile "Creating ext2 filesystem on $tempfile"
     
    22142225
    22152226    cp -Rdf $tgz_dir_fname/* . 2>&1 >> $LOGFILE
    2216     tar -zxf symlinks.tgz || Die "Cannot untar symlinks.tgz"
    22172227
    22182228    cd dev || Die "Can't cd to dev"
     
    22302240    [ -e "/dev/.devfsd" ] && echo "/dev/.devfsd found" > tmp/USE-DEVFS
    22312241
    2232     # Handle the case where busybox and mount are dynamically linked
    2233     file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically"
    2234     if [ $? -eq 0 ]; then
    2235         # We want to use the real mount and all the supported variants (nfs, cifs, ...)
    2236         rm -f bin/mount $MINDI_TMP/busy.lis
    2237         mountlis=`grep -E "mount|fuse|ssh" $DEPLIST_FILE $DEPLIST_DIR/* | grep -v " *#.*" | cut -d: -f2 | sort -u`
    2238         LocateDeps $MINDI_LIB/rootfs/bin/busybox $mountlis >> $MINDI_TMP/busy.lis
    2239         # Special for libs
    2240         for f in `grep -E "libnss" $DEPLIST_FILE $DEPLIST_DIR/* | grep -v " *#.*" | cut -d: -f2`; do
    2241             echo "`ReadAllLink $f`" >> $MINDI_TMP/busy.lis
    2242         done
    2243         # Initial / are trucated by tar
    2244         tar cf - $mountlis `sort -u $MINDI_TMP/busy.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Problem in mount analysis" $MINDI_TMP/$$.log
    2245         rm -f $MINDI_TMP/busy.lis
    2246     fi
     2242    # We need a minimal conf in the initial ramdisk
     2243    mountlis=`grep -v "^#.*" $DEPLIST_FILE_MIN $DEPLIST_DIR/minimal*.conf | cut -d: -f2 | sort -u`
     2244    LocateDeps $mountlis >> $MINDI_TMP/busy.lis
     2245    # Special for libs
     2246    for f in `grep -E "/lib" $DEPLIST_FILE_MIN $DEPLIST_DIR/minimal*.conf | grep -v "^#.*" | cut -d: -f2`; do
     2247        echo "`ReadAllLink $f`" >> $MINDI_TMP/busy.lis
     2248    done
     2249    # Initial / are trucated by tar
     2250    tar cf - $mountlis `sort -u $MINDI_TMP/busy.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Problem in mount analysis" $MINDI_TMP/$$.log
     2251    rm -f $MINDI_TMP/busy.lis
    22472252
    22482253    # Copy of files mandatory for ssh to automate mount if sshfs is used
    22492254    mkdir $mountpoint/.ssh
    22502255    cp -rp ~root/.ssh/*.pub ~root/.ssh/config ~root/.ssh/known* $mountpoint/.ssh 2> /dev/null
    2251     echo > $mountpoint/tmp/myssh << EOF
     2256    cat > $mountpoint/bin/myssh << EOF
    22522257ssh -o StrictHostKeyChecking=no $*
    22532258EOF
    2254     chmod 755 $mountpoint/tmp/myssh
     2259    chmod 755 $mountpoint/bin/myssh
    22552260
    22562261    # Copy of files mandatory for ld.so
     
    28072812    LogAll "Mindi Linux mini-distro generator v$MINDI_VERSION"
    28082813    LogAll "Latest Mindi is available from http://www.mondorescue.org"
    2809     LogAll "BusyBox sources are available from http://www.busybox.net"
    28102814    LogAll "------------------------------------------------------------------------------"
    28112815else
    28122816    LogFile "You are using Mindi-Linux v$MINDI_VERSION to make boot+data disks"
    28132817fi
    2814 if [ -f $MINDI_LIB/rootfs/bin/busybox ]; then
    2815     LogAll "Mindi-`$MINDI_LIB/rootfs/bin/busybox 2>&1 | head -1`"
    2816 else
    2817     LogAll "Unable to find mindi-busybox, please install it"
    2818     MindiExit -1
    2819 fi
    2820 
    28212818# for Mandrake 9.2, which comes with two aes.o.gz modules :-/
    28222819insmod /lib/modules/$KERVERRUN/*/*/misc/aes.*o.gz >> $LOGFILE 2>> $LOGFILE
  • branches/2.2.10/mindi/mindi-bkphw

    r2228 r2445  
    8989    close(SCRIPT);
    9090} else {
    91     print "WARNING: No Hardware support for $productname\n";
     91    print "WARNING: No Hardware support for $productname. Not a big issue, just less features and risks ;-)\n";
    9292    print "You may ask your manufacturer to contribute to the mindi project\n";
    9393}
  • branches/2.2.10/mindi/rootfs/sbin/find-and-mount-cdrom

    r1983 r2445  
    1414            cd $pwd
    1515            if [ "$res" -eq "0" ] ; then
    16                 clear
    1716                LogIt "Using cdstream as extended datadisk ($device). Good." 3
    1817                echo "Using cdstrea as extd dsk." > /tmp/TAPEDEV-HAS-DATA-DISKS
  • branches/2.2.10/mindi/rootfs/sbin/init

    r2444 r2445  
    343343        grep -q RESTORE $CMDLINE
    344344        if [ "$?" -ne 0 ]; then
    345             #clear
    346345            echo "*********************************************************************"
    347346            echo "Do you want to restore the HW configuration of the original machine ?"
     
    578577        mkdir -p /tmp.old
    579578        mv /tmp/* /tmp.old/
    580         # Try to Deal with a busybox bug on inexistant links
    581         cp /tmp/* /tmp.old/
    582579        rm -f /tmp/*
    583580        $mount_cmd /tmp
    584581        mv /tmp.old/* /tmp/
    585         # Try to Deal with a busybox bug on inexistant links
    586         cp /tmp.old/* /tmp/
    587582        rm -rf /tmp.old
    588583        mkdir -p /tmp/tmpfs
     
    774769mkdir -p /tmp/tmpfs
    775770sleep 2
    776 #clear
    777771if [ -e "/dev/md0" ] && [ ! -e "/dev/md/0" ] && [ "`grep /dev/md/ /tmp/mountlist.txt`" != "" ] ; then
    778772    LogIt "Creating /dev/md/* softlinks just in case." 1
  • branches/2.2.10/mindi/rootfs/sbin/install-additional-tools

    r2372 r2445  
    8080cd /
    8181
    82 sync;sync;sync
    83 
    8482LogIt "Done." 1
    8583
  • branches/2.2.10/mindi/rootfs/sbin/wait-for-petris

    r875 r2445  
    2121# Keep running petris until it's killed or crashes
    2222while [ 0 -eq 0 ] ; do
    23     clear
    2423    sleep 1
    2524    petris
  • branches/2.2.10/mondo-doc/mondorescue-howto.sgml

    r2382 r2445  
    10181018</sect1>
    10191019
    1020 <sect1 id="installation-mindi-busybox">
    1021 <title>Mindi Busybox Installation</title>
    1022 <para>If you are installing from a tarball then copy it to wherever
    1023 you have enough space, for example /tmp and type:</para>
    1024 <para></para>
    1025 <informaltable><tgroup cols="1"><tbody>
    1026 <row>
    1027 <entry>
    1028 
    1029         bash# cd /tmp
    1030 </entry>
    1031 </row>
    1032 <row>
    1033     <entry>
    1034         bash# tar -zxvf mindi-busybox-1.x.tgz
    1035     </entry>
    1036 </row>
    1037 <row>
    1038     <entry>
    1039         bash# cd mindi-busybox-1.x
    1040     </entry>
    1041 </row>
    1042 <row>
    1043     <entry>
    1044         bash# make oldconfig
    1045     </entry>
    1046 </row>
    1047 <row>
    1048     <entry>
    1049         bash# make busybox
    1050     </entry>
    1051 </row>
    1052 <row>
    1053     <entry>
    1054         bash# make install
    1055     </entry>
    1056 </row>
    1057 </tbody></tgroup></informaltable>
    1058 <para>This installs busybox files and symlinks into /usr/local/lib/mindi/rootfs
    1059 </para>
    1060 <para>Or, if you are installing from an RPM/deb then copy it to
    1061 wherever you have enough space, for example /tmp and type:</para>
    1062 <para></para>
    1063 <informaltable><tgroup cols="1"><tbody>
    1064 <row>
    1065 <entry>
    1066 
    1067 bash# rpm -Uvh /tmp/mindi-busybox-1.x-x.i386.rpm
    1068 </entry>
    1069 </row>
    1070 <row>
    1071 <entry>
    1072 
    1073 or
    1074 </entry>
    1075 </row>
    1076 <row>
    1077 <entry>
    1078 
    1079 bash# dpkg -i /tmp/mindi-busybox-1.x-x.deb
    1080 
    1081 </entry>
    1082 </row>
    1083 </tbody></tgroup></informaltable>
    1084 
    1085 <para>This installs busybix files and symlinks into /usr/lib/mindi/rootfs
    1086 </para>
    1087 </sect1>
    1088 
    10891020<sect1 id="installation-mondo">
    10901021<title>Mondo Installation</title>
     
    11601091<row>
    11611092    <entry>
    1162         bash# rpm -Va mindi mondo mindi-busybox
     1093        bash# rpm -Va mindi mondo
    11631094    </entry>
    11641095</row>
     
    12151146
    12161147Latest Mindi is available from http://www.mondorescueg
    1217 
    1218 BusyBox sources are available from http://www.busybox.net
    12191148
    12201149------------------------------------------------------------------------------
  • branches/2.2.10/mondo/src/mondoarchive/mondoarchive.c

    r2421 r2445  
    328328    }
    329329
    330     log_to_screen("BusyBox's sources are available from http://www.busybox.net");
    331 
    332330    /* If we're meant to backup then backup */
    333331    if (bkpinfo->backup_data) {
  • branches/2.2.10/tools/quality

    r2391 r2445  
    3131    echo "mondorescue $s usage : "
    3232    tot=0
    33     for i in `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*|monitas|mindi-busybox' | xargs grep -r -c -w $s | egrep -v ":0$"`; do
     33    for i in `find . -name '*.c' -o -name '*.h' |  egrep -v '\.svn|/\*' | xargs grep -r -c -w $s | egrep -v ":0$"`; do
    3434            echo " === $i"
    3535            ((tot=$tot+`echo $i | cut -d: -f2`))
     
    4040echo " "
    4141echo "Qualimetry: "
    42 pbg -w asprintf | grep -vE 'monitas|mindi-busybox|quality|/\*|asprintf\(&' > /tmp/mondo.quality
     42pbg -w asprintf | grep -vE 'quality|/\*|asprintf\(&' > /tmp/mondo.quality
    4343cat /tmp/mondo.quality
    4444echo "mondorescue uses : `cat /tmp/mondo.quality | wc -l` asprintf without &"
    45 pbg -w getline | grep -vE 'monitas|mindi-busybox|quality|/\*|getline\(&' > /tmp/mondo.quality
     45pbg -w getline | grep -vE 'quality|/\*|getline\(&' > /tmp/mondo.quality
    4646cat /tmp/mondo.quality
    4747echo "mondorescue uses : `cat /tmp/mondo.quality | wc -l` getline without &"
Note: See TracChangeset for help on using the changeset viewer.