Changeset 742 in MondoRescue

Timestamp:

Aug 4, 2006, 4:47:01 PM (18 years ago)

Author:

Bruno Cornec

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:

• mindi (modified) (9 diffs)
• rootfs/sbin/start-nfs (modified) (1 diff)

branches/stable/mindi/mindi

@@ -880 +880 @@
         fi
         cp -f $MONDO_TMP/BOOTLOADER.* $bigdir 2> /dev/null || LogIt "\nMondo v1.2x defaults to LILO as the bootloader, BTW.\n"
-    if [ -e "$MONDO_TMP/start-nfs" ] ; then
+    if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
         LogIt "Incorporating NFS-related settings\n"
-        cp -f $MONDO_TMP/start-nfs $bigdir/sbin || Die "Cannot find start-nfs"
-        for r in NFS-SERVER-MOUNT NFS-SERVER-PATH NFS-DEV NFS-CLIENT-IPADDR NFS-SERVER-IPADDR ; do
-        cp -f $MONDO_TMP/$r $bigdir/tmp || Die "Cannot copy $r - did you run out of disk space?"
-                echo "Copying $r to ramdisk" >> $LOGFILE
+        for r in NFS-* ISO-PREFIX ; do
+            cp -f $MONDO_TMP/$r $bigdir/tmp || Die "Cannot copy $r - did you run out of disk space?"
+            echo "Copying $r to ramdisk" >> $LOGFILE
         done
     fi
@@ -1561 +1560 @@
     rm -f $1.tmp
     if [ "$CDRECOVERY" != "yes" ] ; then
-        if [ -e "$MONDO_TMP/start-nfs" ] ; then
+        if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
             echo -en "Press <enter> to continue.\n" >> $1
         elif [ ! "$MONDO_TMP" ] ; then
@@ -1676 +1675 @@
     cd $TMP_ROOT/iso/isolinux
     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?"
-    if [ -e "$MONDO_TMP/start-nfs" ] ; then
-    mv isolinux.cfg isolinux.cfg.old
-    sed s/interactive/iso/ isolinux.cfg.old > isolinux.cfg
+    if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
+        mv isolinux.cfg isolinux.cfg.old
+        sed s/interactive/iso/ isolinux.cfg.old > isolinux.cfg
     fi
     if [ "$ARCH" != "ia64" ] ; then
         cp $ISOLINUX isolinux.bin || Die "Cannot copy isolinux.bin ($ISOLINUX) to tmp_root - did you run out of disk space?"
-    cp $ISOLINUX ../
+        cp $ISOLINUX ../
     fi
     cd $TMP_ROOT/iso
@@ -1690 +1689 @@
     [ "$MONDO_SHARE" ] && cp -f $MONDO_SHARE/autorun .   
     if [ -d "/home/MondoCD" ] ; then
-    cp -pRdu /home/MondoCD/* .
+        cp -pRdu /home/MondoCD/* .
     fi
     if [ "$ARCH" != "ia64" ] ; then
@@ -1730 +1729 @@
     if [ "`DidMondoCallMe`" ] ; then
         if [ "$CDRECOVERY" != "yes" ] ; then
-            if [ -e "$MONDO_TMP/start-nfs" ] ; then
+            if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
                 echo -en "Press <enter> to continue.\n"
             elif [ ! "$MONDO_TMP" ] ; then
@@ -1854 +1853 @@
         echo -en "default=RESTORE\n"
     elif [ "$disksize" -gt "2880" ] && [ "`DidMondoCallMe`" ] ; then
-        if [ -e "$MONDO_TMP/start-nfs" ] ; then
+        if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
             echo -en "default=iso\n"
         else
@@ -1875 +1874 @@
     elif [ "$disksize" -gt "2880" ] ; then
         if [ "`DidMondoCallMe`" ] ; then
-            if [ -e "$MONDO_TMP/start-nfs" ] ; then
+            if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
                 options="iso"
             else
@@ -2101 +2100 @@
 #    tar -zxf $MINDI_LIB/dev.tgz || LogIt "Cannot untar dev.tgz\n" <--- present for LILO; is it nec. for SYSLINUX too?
     cat $sys_cfg_file | HackSyslinuxFile $ramdisk_size $mountpoint > syslinux.cfg || Die "Cannot copy syslinux.cfg from mindi_home to tmp_root"
-    if [ -e "$MONDO_TMP/start-nfs" ] ; then
+    if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
         mv syslinux.cfg syslinux.cfg.orig
         sed s/interactive/iso/ syslinux.cfg.orig > syslinux.cfg
@@ -2839 +2838 @@
         list_of_groovy_mods="$CDROM_MODS `WhichOfTheseModulesAreLoaded "$SCSI_MODS"`"
     fi
-    if [ -e "$MONDO_TMP/start-nfs" ] ; then
-        cp -a $MONDO_TMP/start-nfs $mountpoint/sbin
+    if [ -e "$MONDO_TMP/NFS-DEV" ] ; then
         # For PXE boot
         list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"

branches/stable/mindi/rootfs/sbin/start-nfs

@@ -1 @@
-#!/bin/bash
+#!/bin/sh
 #
 # $Id$