Changeset 2731


Ignore:
Timestamp:
Feb 26, 2011, 5:37:13 PM (9 years ago)
Author:
bruno
Message:
  • Adds functions and /bin/loadkeys (new location) to minimal set of commands to have
  • provides a makemessage option to mindi and this function now works with pbdistrocheck
  • Do not create an error when a phys device has 0 size and is a /dev/dm-* device
Location:
branches/2.2.9
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.9/mindi/deplist.d/minimal.conf

    r2730 r2731  
    1818/bin/df
    1919/usr/bin/loadkeys
     20/bin/loadkeys
    2021/sbin/pidof
    2122/usr/bin/reboot
     23/etc/init.d/functions
    2224
    2325# Compression
  • branches/2.2.9/mindi/mindi

    r2724 r2731  
    15981598    if [ -x "/bin/lsb_release" ]; then
    15991599        DESC=`/bin/lsb_release -d | cut -d: -f2 | sed "s/[ \t]*//"`
     1600    elif [ -r /etc/issue.net ]
     1601        DESC=`head -1 /etc/issue.net`
     1602    elif [ -r /etc/issue ]
     1603        DESC=`head -1 /etc/issue`
    16001604    elif [ -x "/usr/bin/pbdistrocheck" ]; then
    16011605        # For pb >= 0.9.8
    1602         DESC=`/usr/bin/pbdistrocheck -d`
    1603     else
    1604         iss="/dev/null"
    1605         [ -r /etc/issue.net ] && iss="/etc/issue.net"
    1606         [ -r /etc/issue ] && iss="/etc/issue"
    1607         DESC=`head -1 $iss`
     1606        DESC=`/usr/bin/pbdistrocheck -s | cut -d, -f1-4`
     1607    else
     1608        DESC="Unknown desc"
    16081609    fi
    16091610    sed "s/ZZZZZ/$MINDI_VERSION/" $MINDI_LIB/msg-txt | sed "s/KKKKK/Kernel $KERVER/" | sed "s/AAAAA/on a $ARCH architecture/" | sed "s/TTTTT/`LC_TIME=C date`/" | sed "s/MMMMM/`hostname`/" | sed "s/DDDDD/$DESC/"
     
    28672868        export MONDO_SHARE=""
    28682869        MindiExit $?
     2870    elif [ "$1" = "--makemessage" ] ; then
     2871        MakeMessageFile
     2872        MindiExit 0
    28692873    elif [ "$1" = "--makemountlist" ] ; then
    28702874        [ ! "$2" ] && Die "Please specify the output file"
  • branches/2.2.9/mindi/rootfs/sbin/init

    r2727 r2731  
    108108    if which loadkeys > /dev/null 2> /dev/null ; then
    109109        loadkeys $fname
    110 # loadkmap != loadkeys
    111 #    elif which loadkmap > /dev/null 2> /dev/null ; then
    112 #        loadkmap < $fname
    113110    else
    114         LogIt "Using default keyboard map." 1
     111        LogIt "Using default US keyboard map." 1
    115112    fi
    116113}
  • branches/2.2.9/mondo/src/common/libmondo-mountlist.c

    r2665 r2731  
    399399
    400400    if (physical_drive_size < 0) {
    401         mr_asprintf(&tmp, " %s does not exist.", drive);
    402         log_it(tmp);
    403         mr_strcat(flaws_str, "%s", tmp);
    404         res++;
    405         mr_free(tmp);
    406         goto endoffunc;
     401        if (strstr(drive,"/dev/dm-") != NULL) {
     402            mr_asprintf(&tmp, " %s does not exist.", drive);
     403            log_it(tmp);
     404            mr_strcat(flaws_str, "%s", tmp);
     405            res++;
     406            mr_free(tmp);
     407            goto endoffunc;
     408        } else {
     409            mr_asprintf(&tmp, " %s (dm) will be setup later on", drive);
     410            log_it(tmp);
     411            mr_free(tmp);
     412        }
    407413    } else {
    408414        mr_asprintf(&tmp, "%s is %ld MB", drive, physical_drive_size);
Note: See TracChangeset for help on using the changeset viewer.