Changeset 1721


Ignore:
Timestamp:
Oct 28, 2007, 5:00:12 PM (12 years ago)
Author:
bruno
Message:
  • Handles dynamically linked busybox (in case we want to use it soon ;-)
  • Adds fixed devices to create for udev
  • ide-generic should not be part of the initrd when using libata v2
  • support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia64)
Location:
branches/2.2.5/mindi
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/mindi

    r1720 r1721  
    11701170   
    11711171    echo -en "for outerloop in 1 2 3 4 5 ; do\necho -en \".\"\n" >> $outfile
    1172     # BERLIOS: That code is duplicated - Should be done once only
    11731172    list_to_echo="$MODULES"
    11741173    # Remove unwanted modules from list
     
    11841183        infile="/etc/modules.conf"
    11851184    fi
     1185
     1186    # Compute libata version
     1187    laver=`modinfo libata | grep Version | cut -d: -f2 | cut -d. -f1`
     1188
    11861189    for module in $list_to_echo $EXTRA_MODS ; do
     1190        # If libata v2 is used then remove ide-generic as it will perturbate boot
     1191        if [ "$module" = "ide-generic" ] && [ `echo "$MODULES" | grep -q libata` ] && [ $laver -ge 2 ]; then
     1192            continue
     1193        fi
    11871194        params=`sed -n "s/^options \\+$module \\+//p" $infile`
    11881195        modpaths=`FindSpecificModuleInPath $searchpath $module`
     
    17241731    echo -en "."
    17251732    echo "Unmounting $USBDEVICE just in case" >> $LOGFILE
    1726     umount $USBPART 2>&1 >> $LOGFILE
     1733    umount $USBPART 2>> $LOGFILE 1>> $LOGFILE
    17271734    echo "Erasing $USBDEVICE" >> $LOGFILE
    1728     $FDISK $USBDEVICE 2>&1 >> $LOGFILE << EOF
     1735    $FDISK $USBDEVICE 2>> $LOGFILE 1>> $LOGFILE << EOF
    17291736d
    17301737d
     
    17971804    cd $old_pwd
    17981805    echo -en "."
     1806    umount $MINDI_TMP/usb
    17991807    if [ "$ARCH" != "ia64" ] ; then
    1800         umount $MINDI_TMP/usb
    18011808        syslinux $USBPART 2>> $MINDI_TMP/syslinux.log
    18021809        if [ "$?" -ne "0" ] ; then
     
    18111818    else
    18121819        echo "No USB boot support for ia64" | tee -a $LOGFILE
    1813         umount $MINDI_TMP/usb
    18141820        MindiExit -1
    18151821    fi
     
    23922398        incoming=`echo "$incoming" | awk '{if (match($1,/\//)) {print $1} else {if (match($3,/\//)) print $3} fi}'`
    23932399        for f in $incoming ; do
    2394             echo "$f `ReadAllLink $f`"
     2400            echo "$f"
     2401            echo "`ReadAllLink $f`"
    23952402        done
    23962403        read incoming
     
    27712778        if [ -x /sbin/udevd ]; then
    27722779            LocateDeps /sbin/udevd > $MINDI_TMP/udev.lis
    2773             cp -a /sbin/udevd sbin
     2780            cp --parents -Rdf /sbin/udevd `sort -u $MINDI_TMP/udev.lis` .
     2781            rm -f $MINDI_TMP/udev.lis
    27742782        else
    27752783            echo "udevd daemon not in standard place (/sbin)" 2>&1 | tee -a $LOGFILE
     
    27892797
    27902798    cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null
     2799
     2800    # Handle the case where busybox is dynamically linked
     2801    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically"
     2802    if [ $? -eq 0 ]; then
     2803        LocateDeps $MINDI_LIB/rootfs/bin/busybox > $MINDI_TMP/busy.lis
     2804        cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
     2805        rm -f $MINDI_TMP/busy.lis
     2806    fi
    27912807    cd $old_pwd
    27922808    echo -en "..."
  • branches/2.2.5/mindi/rootfs/etc/udev-links.conf

    r1718 r1721  
    4040M nvidiactl c 195 255
    4141
     42# Addition for mindi
     43M tty1      c 104 1
     44M tty2      c 104 2
     45M tty3      c 104 3
     46M tty4      c 104 4
     47M tty5      c 104 5
     48M tty6      c 104 6
     49M tty7      c 104 7
     50M tty8      c 104 8
     51
     52M null      c   1 3
Note: See TracChangeset for help on using the changeset viewer.