Changeset 3277 for branches/3.2


Ignore:
Timestamp:
Apr 30, 2014, 1:42:37 AM (5 years ago)
Author:
bruno
Message:
  • Include not only content of udev.conf files but if directories in it, do that recursively
  • If using systemd-udev, do not extract all devs as it perturbates LVM
  • First version where mindi works out of the box with Fedora 20
Location:
branches/3.2/mindi
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3270 r3277  
    25402540    fi
    25412541
    2542     # Copy of files from the minimal env needed as per the deplist.d/minimal.conf file (which includes all busybox deps)
     2542    # Copy of files from the minimal env needed as per the deplist.d/minimal.conf & udev.conf file (which includes all busybox deps)
    25432543    rm -f $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis
    2544     for f in `grep -v " *#.*" $DEPLIST_DIR/minimal.conf | sort -u`; do
    2545         if [ -r $f ]; then
    2546             echo $f >> $MINDI_TMP/minimal.lis
    2547             LocateDeps $f >> $MINDI_TMP/minimal2.lis
     2544    for f in `cat $DEPLIST_DIR/minimal.conf $DEPLIST_DIR/udev.conf | grep -vE " *#.*|^#" | sort -u` ; do
     2545        if [ -d $f ]; then
     2546            for g in `find $f`; do
     2547                echo $g >> $MINDI_TMP/minimal.lis
     2548                LocateDeps $g  >> $MINDI_TMP/minimal2.lis
     2549            done
     2550        else
     2551            if [ -r $f ]; then
     2552                echo $f >> $MINDI_TMP/minimal.lis
     2553                LocateDeps $f >> $MINDI_TMP/minimal2.lis
     2554            fi
    25482555        fi
    25492556    done
  • branches/3.2/mindi/rootfs/etc/init.d/rcS

    r3274 r3277  
    7474ExtractDevTarballs() {
    7575    cd /
    76     for fname in ataraid.tgz ida.tgz i2o.tgz rd.tgz raw.tgz cciss.tgz nst.tgz dm.tgz vc.tgz ; do
    77         if [ ! -e "/$fname" ] ; then
    78             LogIt "/$fname not found; cannot extract to /." 1
    79         else
    80             echo -en "\rExtracting /$fname...     "
    81             tar -zxf /$fname || LogIt "Error occurred while extracting /$fname"
    82         fi
    83     done
     76    if [ -x /usr/lib/systemd/systemd-udevd ]; then
     77        # Just use vc dev files. The other are useless and create huge delays with LVM
     78        tar -zxf /vc.tgz || LogIt "Error occurred while extracting /vc.tgz"
     79    else
     80        for fname in ataraid.tgz ida.tgz i2o.tgz rd.tgz raw.tgz cciss.tgz nst.tgz dm.tgz vc.tgz ; do
     81            if [ ! -e "/$fname" ] ; then
     82                LogIt "/$fname not found; cannot extract to /." 1
     83            else
     84                echo -en "\rExtracting /$fname...     "
     85                tar -zxf /$fname || LogIt "Error occurred while extracting /$fname"
     86            fi
     87        done
     88    fi
    8489    echo -en "\r"
    8590    LogIt "Extracted additional /dev entries OK.     " 1
     
    396401    ps | grep -v grep |grep udevd 2> /dev/null 1> /dev/null
    397402    if [ $? -ne 0 ]; then
     403        echo "Waiting for udev to start..."
    398404        if [ -x /sbin/udevd ]; then
    399405            /sbin/udevd --daemon &
     
    402408        elif [ -x /usr/lib/systemd/systemd-udevd ]; then
    403409            # from https://github.com/hut/minirc/blob/master/rc
     410            echo "INFO: This is the systemd version of udev"
    404411            mkdir -p /run/systemd/journal
    405412            /usr/lib/systemd/systemd-udevd --daemon
     
    407414            udevadm trigger --action=add --type=devices
    408415        fi
    409         echo "Waiting for udev to start..."
    410416        sleep 5
    411417        LogIt "udev started manually" 1
     
    487493        # Recent LVM need this caching daemon to work
    488494        if [ -x /usr/sbin/lvmetad ]; then
     495            mkdir -p /run/lvm
    489496            /usr/sbin/lvmetad
    490497        fi
     
    863870rm -f $LOGFILE
    864871
     872mkdir /proc 2> /dev/null
     873mount /proc /proc -t proc
     874
    865875# Creates log file
    866876LogIt ""
    867 echo "Welcome to init (from mindi ${MINDI_VER}-r${MINDI_REV})" | tee -a $LOGFILE
    868 
    869 mkdir /proc 2> /dev/null
    870 mount /proc /proc -v -t proc  2>> $LOGFILE
    871 mkdir /sys 2> /dev/null
    872 mount /sys /sys -v -t sysfs 2>> $LOGFILE
    873 
    874877# Redirect every message to the LOGFILE
    875878exec > >(tee -a ${LOGFILE})
    876879exec 2> >(tee -a ${LOGFILE} >&2)
     880
     881echo "Welcome to init (from mindi ${MINDI_VER}-r${MINDI_REV})" | tee -a $LOGFILE
     882
     883mkdir /sys 2> /dev/null
     884mount /sys /sys -t sysfs
    877885
    878886[ ! "$GROOVY" ] && Die "I'm not groovy!"
Note: See TracChangeset for help on using the changeset viewer.