Changeset 3270 in MondoRescue

Timestamp:

Apr 29, 2014, 9:17:02 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Remove now useless mr-net-find
• Rename in mindi the conf file mondo-restore.cfg into mondorestore.cfg for homogeneity
• NETFS-SERVER-MOUNT remains the only built file by mondo for net configuration and mindi now uses mr-net-get-config to build the network conf

Location:

branches/3.2/mindi

Files:

• mindi (modified) (12 diffs)
• mr-net-find (deleted)

branches/3.2/mindi/mindi

@@ -650 +650 @@
         fi
         cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2>> $LOGFILE || LogIt "\nINFO: Mondo v1.2x defaults to LILO as the bootloader, BTW."
-        if [ -e "$MINDI_TMP/NETFS-DEV" ] ; then
+        if [ -e "$MINDI_TMP/NETFS-SERVER-MOUNT" ] ; then
             LogAll "\nINFO: Incorporating Network-related settings"
             for r in NETFS-* ISO-PREFIX ; do
@@ -974 +974 @@
 }
 
-# Called by TurnTgzIntoRdz, to make /tmp/mondo-restore.cfg
+# Called by TurnTgzIntoRdz, to make /tmp/mondorestore.cfg
 MakeMondoConfigFile() {
     local outfile use_lzo use_comp use_star
@@ -997 +997 @@
     echo "datestamp `date`" >> $outfile
     [ "$ESTIMATED_TOTAL_NOOF_SLICES" ] && echo "total-slices $ESTIMATED_TOTAL_NOOF_SLICES" >> $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-DEV           netfs-dev           $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-PROTO         netfs-proto           $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-IPADDR netfs-client-ipaddr $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-NETMASK netfs-client-netmask $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-BROADCAST netfs-client-broadcast $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-HWADDR netfs-client-hwaddr $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-DEFGW  netfs-client-defgw  $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-MOUNT  netfs-server-mount  $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-USER  netfs-server-user  $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-PATH   netfs-server-path   $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-IPADDR netfs-server-ipaddr $outfile
     AddFileToCfgIfExists $MINDI_TMP/ISO-DEV           iso-dev           $outfile
     AddFileToCfgIfExists $MINDI_TMP/ISO-MNT           iso-mnt           $outfile
@@ -1022 +1011 @@
     AddFileToCfgIfExists $MINDI_TMP/XATTR      xattr      $outfile
     AddFileToCfgIfExists $MINDI_TMP/OBDR      obdr      $outfile
+    # Deal with network configuration in a portable way
+    if [ -f $MINDI_TMP/NETFS-SERVER-MOUNT ]; then
+        mr-net-get-config `cat $MINDI_TMP/NETFS-SERVER-MOUNT` >> $outfile
+        grep netfs-server-path $outfile | awk '{print $2}' > $MINDI_TMP/NETFS-SERVER-PATH
+    fi
 }
 
@@ -1733 +1727 @@
     if [ _"$MONDO_SHARE" != _"" ]; then
         if [ "$CDRECOVERY" != "yes" ] ; then
-            if [ -e "$MINDI_TMP/NETFS-DEV" ] ; then
+            if [ -e "$MINDI_TMP/NETFS-SERVER-MOUNT" ] ; then
                 echo -en "Press <enter> to continue.\n"
             elif [ ! "$MINDI_TMP" ] ; then
@@ -1780 +1774 @@
     # In case it's mondoarchive
     elif [ _"$MONDO_SHARE" != _"" ]; then
-        if [ -e "$MINDI_TMP/NETFS-DEV" ] ; then
+        if [ -e "$MINDI_TMP/NETFS-SERVER-MOUNT" ] ; then
             echo -en "default${sep}iso\n"
         else
@@ -1899 +1893 @@
 
     mkdir -p $mountpoint/tmp
-    if [ -f "$MINDI_TMP/mondo-restore.cfg" ]; then
-        cp -f $MINDI_TMP/mondo-restore.cfg $mountpoint/tmp
+    if [ -f "$MINDI_TMP/mondorestore.cfg" ]; then
+        cp -f $MINDI_TMP/mondorestore.cfg $mountpoint/tmp
     fi
 
@@ -1994 +1988 @@
 
     mkdir -p $mountpoint/tmp
-    if [ -f "$MINDI_TMP/mondo-restore.cfg" ]; then
-        cp -f $MINDI_TMP/mondo-restore.cfg $mountpoint/tmp
+    if [ -f "$MINDI_TMP/mondorestore.cfg" ]; then
+        cp -f $MINDI_TMP/mondorestore.cfg $mountpoint/tmp
     fi
 
@@ -2100 +2094 @@
     mkdir -p $bigdir/tmp
     if [ _"$MONDO_SHARE" != _"" ]; then
-        MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
-        cp -f $MINDI_TMP/mondo-restore.cfg $bigdir/tmp &> /dev/null
+        # BCO: no reason to have the cfg file stored twice
+        MakeMondoConfigFile $MINDI_TMP/mondorestore.cfg
+        cp -f $MINDI_TMP/mondorestore.cfg $bigdir/tmp &> /dev/null
     fi
     [ -d "/mnt/.boot.d" ] && echo "GENTOO" > $bigdir/tmp/DUMBASS-GENTOO
@@ -2680 +2675 @@
     list_of_groovy_mods="$CDROM_MODS $FORCE_MODS"
 
-    if [ -e "$MINDI_TMP/NETFS-DEV" ] ; then
+    if [ -e "$MINDI_TMP/NETFS-SERVER-MOUNT" ] ; then
         # For PXE boot
         list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
@@ -2770 +2765 @@
     [ "$TAPEDEV" ] && echo -en "$TAPEDEV" > $mountpoint/tmp/TAPEDEV-LIVES-HERE
     if [ _"$MONDO_SHARE" != _"" ]; then
-        MakeMondoConfigFile $mountpoint/tmp/mondo-restore.cfg
-        cp -f $mountpoint/tmp/mondo-restore.cfg $MINDI_TMP 2>> $LOGFILE || Die "Cannot copy mondo-restore.cfg to ramdisk"
+        MakeMondoConfigFile $mountpoint/tmp/mondorestore.cfg
+        cp -f $mountpoint/tmp/mondorestore.cfg $MINDI_TMP 2>> $LOGFILE || Die "Cannot copy mondorestore.cfg to ramdisk"
         cp -f $MINDI_TMP/mountlist.txt $mountpoint/tmp/ 2>> $LOGFILE || Die "Cannot copy mountlist to ramdisk"
         echo -en "$FILES_IN_FILELIST" > $mountpoint/tmp/FILES-IN-FILELIST
@@ -3290 +3285 @@
 LogFile "NOT_BOOT = '$NOT_BOOT'"
 if [ "$NOT_BOOT" != "" ] && [ "$NOT_BOOT" != "0" ] && [ "$NOT_BOOT" != "no" ] ; then
-    LogIt "INFO: Just creating mondo-restore.cfg and a small all.tar.gz for Mondo. Nothing else."
-    MakeMondoConfigFile $MINDI_TMP/mondo-restore.cfg
+    LogIt "INFO: Just creating mondorestore.cfg and a small all.tar.gz for Mondo. Nothing else."
+    MakeMondoConfigFile $MINDI_TMP/mondorestore.cfg
     MakeMountlist $MINDI_TMP/mountlist.txt
     CheckMountlist $MINDI_TMP/mountlist.txt
     mkdir -p $MINDI_TMP/small-all/tmp
     cd "$MINDI_TMP/small-all"
-    cp -f $MINDI_TMP/{mountlist.txt,mondo-restore.cfg,filelist.full.gz,biggielist.txt} tmp 2>> $LOGFILE || Die "Cannot copy small all.tar.gz"
+    cp -f $MINDI_TMP/{mountlist.txt,mondorestore.cfg,filelist.full.gz,biggielist.txt} tmp 2>> $LOGFILE || Die "Cannot copy small all.tar.gz"
     tar -cv ./tmp | gzip -9 > $MINDI_TMP/all.tar.gz 2>> $MINDI_TMP/$$.log || Die "Cannot make small all.tar.gz" $MINDI_TMP/$$.log
     sleep 2