Changeset 1927


Ignore:
Timestamp:
Apr 18, 2008, 2:59:01 PM (11 years ago)
Author:
bruno
Message:
  • Fixing broken NFS support in 2.2.5 for rhel5 where additional command like mount.nfs is needed
  • Need to loopback mount when using NFS (wasn't needed with busybox version)
  • Fix broken udev support introduced by fixing non-udev support during 2.2.6
Location:
branches/2.2.6/mindi
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.6/mindi/deplist.txt

    r1922 r1927  
    4242fdisk hdparm parted uname
    4343loadkeys
    44 mount
     44# This line require absolute paths now !
     45/bin/mount
     46/sbin/mount.nfs /sbin/mount.nfs4
     47/sbin/mount.fuse
     48/sbin/mount.cifs /sbin/mount.cifs3
     49/sbin/mount.smb /sbin/mount.smb3
     50/sbin/mount.smbfs /sbin/mount.smbfs3
    4551devfsd burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
    4652# helps for debugging
  • branches/2.2.6/mindi/mindi

    r1922 r1927  
    6464IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide-cs ide-core ide_core edd paride ata_generic ata_piix libata via82cxxx generic nvidia ahci sata_nv cmd64x pata_amd pata_marvell pata_serverworks"
    6565PCMCIA_MODS="pcmcia_core ds yenta_socket"
    66 USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual"
     66USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual scsi_mod"
    6767CDROM_MODS="$TAPE_MODS $IDE_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_base nls_cp437 nls_utf8 sg sr_mod zlib_inflate iso9660 $USB_MODS $PCMCIA_MODS"
    6868NET_MODS="sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 e1000 eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmnet"
     
    168168
    169169    mkdir -p $bigdir/etc
    170     #cp --parents -pRdf $mappath $bigdir 2>> $LOGFILE || LogIt "AKMF -- Could not copy $mappath to $bigdir"
    171170    tar cf - $mappath 2>> /dev/null | (cd $bigdir ; tar xf -) || LogIt "AKMF -- Could not copy $mappath to $bigdir"
    172171    if [ "`echo $mappath | grep -F ".gz"`" ] ; then
     
    278277                BIGNO=$(($BIGNO+1))
    279278            else
    280                 #cp --parents -Rdf $incoming $outdir 2> /dev/null || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
    281279                tar cf - $incoming 2> /dev/null | (cd $outdir ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?"
    282280   
     
    19961994        cd $MINDI_TMP
    19971995        for i in `ListKernelModulePaths | HackPathsToFailsafe` ; do
    1998             #cp --parents -pRdf ./$i $bigdir 2>> $LOGFILE || Die "PDDI can't cp $i->$bigdir"
    19991996            tar cf - ./$i 2>> $LOGFILE | (cd $bigdir ; tar xf -) || Die "PDDI can't copy $i->$bigdir"
    20001997            if [ "`du -sk $i | cut -f1`" -lt "$(($CHOPSIZE*2))" ] ; then
    2001                 #cp --parents -pRdf $i $bigdir 2>> $LOGFILE
    20021998                tar cf - $i 2>> $LOGFILE | (cd $bigdir ; tar xf -)
    20031999            else
     
    20112007            for k in $j ; do
    20122008                if [ "`du -sk $k | cut -f1`" -lt "$CHOPSIZE" ] ; then
    2013                     #cp --parents -pRdf $k $bigdir 2>> $LOGFILE
    20142009                    tar cf - $k 2>> $LOGFILE | (cd $bigdir ; tar xf -)
    20152010                else
     
    23872382        s=`which $w 2> /dev/null`
    23882383        if [ -e "$s" ] ; then
    2389             #cp --parents -af $s . 2>> $LOGFILE
    23902384            tar cf - $s 2> /dev/null | tar xf -
    23912385        fi
     
    23972391    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically"
    23982392    if [ $? -eq 0 ]; then
    2399         # We want to use the real mount
    2400         rm -f bin/mount
    2401         LocateDeps $MINDI_LIB/rootfs/bin/busybox /bin/mount > $MINDI_TMP/busy.lis
    2402         #cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
    2403         tar cf - /bin/mount `sort -u $MINDI_TMP/busy.lis` 2> /dev/null | tar xf -
     2393        # We want to use the real mount and all the supported variants (nfs, cifs, ...)
     2394        rm -f bin/mount $MINDI_TMP/busy.lis
     2395        mountlis=`grep mount $DEPLIST_FILE`
     2396        for f in $MINDI_LIB/rootfs/bin/busybox $mountlis ; do
     2397            if [ -f $f ]; then
     2398                LocateDeps $f >> $MINDI_TMP/busy.lis
     2399            fi
     2400        done
     2401        tar cf - $mountlis `sort -u $MINDI_TMP/busy.lis` 2> /dev/null | tar xf -
    24042402        rm -f $MINDI_TMP/busy.lis
    24052403    fi
     
    24112409        echo "udev device manager found" > $mountpoint/tmp/USE-UDEV
    24122410        LogIt "udev device manager found"
    2413         #cp --parents -Rdf /etc/udev . 2> /dev/null
    24142411        tar cf - /etc/udev 2> /dev/null | tar xf -
    24152412        # This avoids NIC remapping if on another machine at restore time on Debian at least
    24162413        rm -f ./etc/udev/rules.d/z25_persistent-net.rules
    2417         #cp --parents -Rdf /lib/udev /lib64/udev . 2> /dev/null
    24182414        tar cf - /lib*/udev 2> /dev/null | tar xf -
    24192415        if [ -x /sbin/udevd ]; then
     
    24422438                fi
    24432439            done
    2444             #cp --parents -Rdf $lis `sort -u $MINDI_TMP/udev.lis` .
    24452440            tar cf - $lis `sort -u $MINDI_TMP/udev.lis` 2> /dev/null | tar xf -
    24462441            rm -f $MINDI_TMP/udev.lis
     
    24612456            lis=`grep -Ev '^#' $MINDI_CACHE/tools.files`
    24622457            LocateDeps $lis > $MINDI_TMP/tools.lis
    2463             #cp --parents -Rdf $lis `sort -u $MINDI_TMP/tools.lis` .
    24642458            tar cf - $lis `sort -u $MINDI_TMP/tools.lis` 2> /dev/null | tar xf -
    24652459        fi
     
    24812475    fi
    24822476
    2483     #cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null
    24842477    tar cf - /dev/fd0*[1,2][4,7,8]* 2> /dev/null | tar xf -
    24852478
     
    25242517        [ "$YOUR_KERNEL_SUCKS" ] && i=$MINDI_TMP/$i
    25252518        echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
    2526         #cp --parents -Rpdf $i $mountpoint 2>/dev/null || LogIt "Unable to copy $i to $mountpoint"
    25272519        tar cf - $i 2>/dev/null | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy $i to $mountpoint"
    25282520        # Uncompress modules if not using udev and native modprobe
     
    25362528
    25372529    # Also copy modules.dep in case of udev so that normal modprobe works
    2538     #cp --parents -Rpdf /$needed_modules_path/modules.dep $mountpoint 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint"
    25392530    tar cf - /$needed_modules_path/modules.dep 2>/dev/null | (cd $mountpoint ; tar xf -) || LogIt "Unable to copy modules.dep to $mountpoint"
    25402531
  • branches/2.2.6/mindi/rootfs/sbin/init

    r1922 r1927  
    531531
    532532    for m in `find /lib/modules -name '*\.ko*' -o -name '*\.o*'`; do
    533         j=`basename $m | sed 's/\.ko.*$//'`
    534         j=`basename $m | sed 's/\.o.*$//'`
     533        k=`basename $m | sed 's/\.ko.*$//'`
     534        j=`basename $k | sed 's/\.o.*$//'`
    535535        echo "$DENY_MODS" | grep -q "$j "
    536536        if [ $? -eq 0 ]; then
  • branches/2.2.6/mindi/rootfs/sbin/start-nfs

    r1830 r1927  
    6868    # Finally mounts the NFS share
    6969    LogIt "Mounting NFS share ($nfsmount) on /tmp/isodir..."
     70    touch /etc/mtab
    7071    mount -t nfs -o nolock $nfsmount /tmp/isodir
    7172   
    7273    LogIt "Mounting NFS image ${imgname}-1.iso in $dirimg on /mnt/cdrom in loopback"
    73     mount -o ro -t iso9660 /tmp/isodir/$dirimg/${imgname}-1.iso /mnt/cdrom
     74    mount -o ro,loop -t iso9660 /tmp/isodir/$dirimg/${imgname}-1.iso /mnt/cdrom
    7475fi
Note: See TracChangeset for help on using the changeset viewer.