Changeset 2951


Ignore:
Timestamp:
Feb 16, 2012, 3:18:39 AM (6 years ago)
Author:
bruno
Message:
  • Force inclusion all all files mentioned in minimal.conf. This will allow easier support of additional features (such as rpcbind for NFS on RHEL 6.2)
Location:
branches/3.0/mindi
Files:
5 edited

Legend:

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

    r2909 r2951  
    3232/sbin/klogd
    3333/sbin/syslogd
     34/sbin/rsyslogd
    3435# On ArchLinux
    3536/usr/sbin/syslog-ng
     
    135136/sbin/ifconfig
    136137/sbin/route
    137 /sbin/dhclient
    138 /var/lib/dhcp/dhclient.leases
    139 # On ArchLinnux
    140 /sbin/dhcpcd
    141 /var/lib/dhcpd
     138/sbin/rpcbind
    142139
    143140# Busybox
  • branches/3.0/mindi/deplist.d/net.conf

    r2436 r2951  
    88/usr/bin/scp
    99
     10# DHCP
     11/sbin/dhclient
     12/var/lib/dhcp/dhclient.leases
     13# On ArchLinnux
     14/sbin/dhcpcd
     15/var/lib/dhcpd
     16
    1017# Useful for debug
    1118/usr/sbin/ethtool
  • branches/3.0/mindi/mindi

    r2948 r2951  
    10691069    done
    10701070    [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`"
    1071     printf "        %-15s %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL/UUID | tee -a $LOGFILE
     1071    printf "        %-15s %-15s %-15s %-13s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)" LABEL/UUID | tee -a $LOGFILE
    10721072    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 tmpfs devpts sysfs proc debugfs"
    10731073    for c_p in $all_partitions ; do
     
    24862486
    24872487    [ -e "/dev/.devfsd" ] && echo "/dev/.devfsd found" > tmp/USE-DEVFS
    2488 
    2489     # Handle the case where busybox and mount are dynamically linked
    2490     file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically"
    2491     if [ $? -eq 0 ]; then
    2492         # We want to use the real mount and all the supported variants (nfs, cifs, ...)
    2493         rm -f bin/mount $MINDI_TMP/busy.lis
    2494         mountlis=`grep -E "mount|fuse|ssh" $DEPLIST_FILE $DEPLIST_DIR/* | grep -v " *#.*" | cut -d: -f2 | sort -u`
    2495         LocateDeps $MINDI_LIB/rootfs/bin/busybox $mountlis >> $MINDI_TMP/busy.lis
    2496         # Special for libs
    2497         for f in `grep -E "libnss" $DEPLIST_FILE $DEPLIST_DIR/* | grep -v " *#.*" | cut -d: -f2`; do
    2498             echo "`ReadAllLink $f`" >> $MINDI_TMP/busy.lis
    2499         done
    2500         # Initial / are trucated by tar
    2501         tar cf - $mountlis `sort -u $MINDI_TMP/busy.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Problem in mount analysis" $MINDI_TMP/$$.log
    2502         rm -f $MINDI_TMP/busy.lis
    2503     fi
    2504 
     2488   
    25052489    # Copy of files mandatory for ssh to automate mount if sshfs is used
    25062490    mkdir $mountpoint/.ssh
     
    25142498    cp -rp /etc/ld.so.c* $mountpoint/etc
    25152499
    2516     # Avoid an issue on some distro (RHEL5)
     2500    # Handle the case where busybox and mount are dynamically linked
     2501    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically"
     2502    if [ $? -eq 0 ]; then
     2503        # We want to use the real mount and all the supported variants (nfs, cifs, ...)
     2504        rm -f bin/mount
     2505    fi
     2506
     2507    # Copy of files from the minimal env needed as per the deplist.d/minimal.conf file (which includes all busybox deps)
     2508    minimallis=`grep -Ev '^#' $DEPLIST_DIR/minimal.conf`
     2509    rm -f $MINDI_TMP/minimal.lis
     2510    for f in $MINDI_LIB/rootfs/bin/busybox $minimallis; do
     2511        echo $f >> $MINDI_TMP/minimal.lis
     2512    done
     2513    LocateDeps $MINDI_LIB/rootfs/bin/busybox $minimallis >> $MINDI_TMP/minimal.lis
     2514    for f in `cat $MINDI_TMP/minimal.lis`; do
     2515        echo "`ReadAllLink $f`" >> $MINDI_TMP/minimal.lis
     2516    done
     2517    # Initial / are trucated by tar
     2518    tar cf - `sort -u $MINDI_TMP/minimal.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "Problem in minimal analysis" $MINDI_TMP/$$.log
     2519    bash
     2520    rm -f $MINDI_TMP/minimal.lis
     2521
     2522    # Avoids an issue on some distro (RHEL5)
    25172523    rm -f $mountpoint/etc/ld.so.conf.d/kernelcap*
    25182524
  • branches/3.0/mindi/rootfs/etc/init.d/rcS

    r2925 r2951  
    709709if [ -x /sbin/udevadm ]; then
    710710    v=`/sbin/udevadm --version`
     711    echo "Triggering udev again..."
    711712    if [ "$v" -ge "146" ]; then
    712713        /sbin/udevadm trigger --type=failed
  • branches/3.0/mindi/rootfs/sbin/start-netfs

    r2887 r2951  
    105105        sshfs -o ro,StrictHostKeyChecking=no $netfsopt $netfsmount /tmp/isodir
    106106    elif [ "$proto" != "" ]; then
     107        if [ -x /sbin/rpcbind ]; then
     108            "Startng rpcbind daemon..."
     109            /sbin/rpcbind &
     110        fi
    107111        LogIt "Mounting Network share ($netfsmount) on /tmp/isodir..."
    108112        touch /etc/mtab
Note: See TracChangeset for help on using the changeset viewer.