Changeset 1786


Ignore:
Timestamp:
Nov 12, 2007, 4:28:35 PM (12 years ago)
Author:
bruno
Message:

Do busybox ldd first in order to create a potential /lib64 link correctly and then use it later in the image

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/mindi

    r1785 r1786  
    17081708        LogIt "Failed to create ISO image."
    17091709    else
    1710         echo "Created bootable ISO image at $CACHE_LOC/mindi.iso" >> $LOGFILE
     1710        echo "Created bootable ISO image at $CACHE_LOC/mindi.iso" | tee -a $LOGFILE
    17111711    fi
    17121712    rm -f $MINDI_TMP/mkisofs.log
     
    17181718    local i old_pwd
    17191719    if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ _"$MONDO_SHARE" = _"" ]; then
    1720         echo "Shall I make a bootable USB image ? (y/[n] "
     1720        echo -n "Shall I make a bootable USB image ? (y/[n]) "
    17211721        read i
    17221722        [ "$i" != "y" ] && [ "$i" != "Y" ] && return 0
     
    28052805    mkdir -p tmp
    28062806    [ -e "/dev/.devfsd" ] && echo "/dev/.devfsd found" > tmp/USE-DEVFS
     2807
     2808    # Handle the case where busybox is dynamically linked
     2809    # Should be done first so that if /lib64 is a link, it's
     2810    # created first like that, instead of as a real dir later on
     2811    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically"
     2812    if [ $? -eq 0 ]; then
     2813        LocateDeps $MINDI_LIB/rootfs/bin/busybox > $MINDI_TMP/busy.lis
     2814        cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
     2815        rm -f $MINDI_TMP/busy.lis
     2816    fi
    28072817
    28082818    # Management of udev (which includes modprobe in rules)
     
    28382848        fi
    28392849    fi
     2850
    28402851    # Management of potential HW info (Proliant only at the moment)
    28412852    mindi-bkphw $CACHE_LOC $MINDI_CONF | tee -a $LOGFILE
     
    28652876    cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null
    28662877
    2867     # Handle the case where busybox is dynamically linked
    2868     file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically"
    2869     if [ $? -eq 0 ]; then
    2870         LocateDeps $MINDI_LIB/rootfs/bin/busybox > $MINDI_TMP/busy.lis
    2871         cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
    2872         rm -f $MINDI_TMP/busy.lis
    2873     fi
    28742878    cd $old_pwd
    28752879    echo -en "..."
Note: See TracChangeset for help on using the changeset viewer.