Changeset 742


Ignore:
Timestamp:
Aug 4, 2006, 4:47:01 PM (13 years ago)
Author:
bruno
Message:
  • start-nfs is a sh script (not bash)
  • removing start-nfs generation broke also mindi, so test now with file NFS-DEV instead
Location:
branches/stable/mindi
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/mindi

    r741 r742  
    880880        fi
    881881        cp -f $MONDO_TMP/BOOTLOADER.* $bigdir 2> /dev/null || LogIt "\nMondo v1.2x defaults to LILO as the bootloader, BTW.\n"
    882     if [ -e "$MONDO_TMP/start-nfs" ] ; then
     882    if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
    883883        LogIt "Incorporating NFS-related settings\n"
    884         cp -f $MONDO_TMP/start-nfs $bigdir/sbin || Die "Cannot find start-nfs"
    885         for r in NFS-SERVER-MOUNT NFS-SERVER-PATH NFS-DEV NFS-CLIENT-IPADDR NFS-SERVER-IPADDR ; do
    886         cp -f $MONDO_TMP/$r $bigdir/tmp || Die "Cannot copy $r - did you run out of disk space?"
    887                 echo "Copying $r to ramdisk" >> $LOGFILE
     884        for r in NFS-* ISO-PREFIX ; do
     885            cp -f $MONDO_TMP/$r $bigdir/tmp || Die "Cannot copy $r - did you run out of disk space?"
     886            echo "Copying $r to ramdisk" >> $LOGFILE
    888887        done
    889888    fi
     
    15611560    rm -f $1.tmp
    15621561    if [ "$CDRECOVERY" != "yes" ] ; then
    1563         if [ -e "$MONDO_TMP/start-nfs" ] ; then
     1562        if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
    15641563            echo -en "Press <enter> to continue.\n" >> $1
    15651564        elif [ ! "$MONDO_TMP" ] ; then
     
    16761675    cd $TMP_ROOT/iso/isolinux
    16771676    cat $iso_cfg_file | HackSyslinuxFile $ramdisk_size $TMP_ROOT/iso > isolinux.cfg || Die "Cannot copy isolinux.cfg from mindi_home to tmp_root - did you run out of disk space?"
    1678     if [ -e "$MONDO_TMP/start-nfs" ] ; then
    1679     mv isolinux.cfg isolinux.cfg.old
    1680     sed s/interactive/iso/ isolinux.cfg.old > isolinux.cfg
     1677    if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
     1678        mv isolinux.cfg isolinux.cfg.old
     1679        sed s/interactive/iso/ isolinux.cfg.old > isolinux.cfg
    16811680    fi
    16821681    if [ "$ARCH" != "ia64" ] ; then
    16831682        cp $ISOLINUX isolinux.bin || Die "Cannot copy isolinux.bin ($ISOLINUX) to tmp_root - did you run out of disk space?"
    1684     cp $ISOLINUX ../
     1683        cp $ISOLINUX ../
    16851684    fi
    16861685    cd $TMP_ROOT/iso
     
    16901689    [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .   
    16911690    if [ -d "/home/MondoCD" ] ; then
    1692     cp -pRdu /home/MondoCD/* .
     1691        cp -pRdu /home/MondoCD/* .
    16931692    fi
    16941693    if [ "$ARCH" != "ia64" ] ; then
     
    17301729    if [ "`DidMondoCallMe`" ] ; then
    17311730        if [ "$CDRECOVERY" != "yes" ] ; then
    1732             if [ -e "$MONDO_TMP/start-nfs" ] ; then
     1731            if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
    17331732                echo -en "Press <enter> to continue.\n"
    17341733            elif [ ! "$MONDO_TMP" ] ; then
     
    18541853        echo -en "default=RESTORE\n"
    18551854    elif [ "$disksize" -gt "2880" ] && [ "`DidMondoCallMe`" ] ; then
    1856         if [ -e "$MONDO_TMP/start-nfs" ] ; then
     1855        if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
    18571856            echo -en "default=iso\n"
    18581857        else
     
    18751874    elif [ "$disksize" -gt "2880" ] ; then
    18761875        if [ "`DidMondoCallMe`" ] ; then
    1877             if [ -e "$MONDO_TMP/start-nfs" ] ; then
     1876            if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
    18781877                options="iso"
    18791878            else
     
    21012100#    tar -zxf $MINDI_LIB/dev.tgz || LogIt "Cannot untar dev.tgz\n" <--- present for LILO; is it nec. for SYSLINUX too?
    21022101    cat $sys_cfg_file | HackSyslinuxFile $ramdisk_size $mountpoint > syslinux.cfg || Die "Cannot copy syslinux.cfg from mindi_home to tmp_root"
    2103     if [ -e "$MONDO_TMP/start-nfs" ] ; then
     2102    if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
    21042103        mv syslinux.cfg syslinux.cfg.orig
    21052104        sed s/interactive/iso/ syslinux.cfg.orig > syslinux.cfg
     
    28392838        list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
    28402839    fi
    2841     if [ -e "$MONDO_TMP/start-nfs" ] ; then
    2842         cp -a $MONDO_TMP/start-nfs $mountpoint/sbin
     2840    if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
    28432841        # For PXE boot
    28442842        list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
  • branches/stable/mindi/rootfs/sbin/start-nfs

    r741 r742  
    1 #!/bin/bash
     1#!/bin/sh
    22#
    33# $Id$
Note: See TracChangeset for help on using the changeset viewer.