Changeset 1085 in MondoRescue

Timestamp:

Jan 30, 2007, 11:06:16 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r1081:1082 $SVN_M/branches/stable

File:

• trunk/mindi/mindi (modified) (4 diffs)

trunk/mindi/mindi

@@ -577 +577 @@
     AddKeyboardMappingFile $mappath
     echo -e "$DONE"
+    rm -f $MINDI_TMP/keymaps.find
     return 0
 }
@@ -976 +977 @@
     fi
     output=""
-    #for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin /usr/lib /usr/lib64 /lib /lib64 /usr/local/lib /usr/local/lib64 /usr/X11R6/lib /usr/X11R6/lib64 `find /usr/lib64 /lib64 /usr/local/lib64 /usr/X11R6/lib64 -type d` ; do
     for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin /usr/lib /usr/lib64 /usr/lib64/* /lib /lib64 /lib64/* /usr/local/lib /usr/local/lib64 /usr/local/lib64/* /usr/X11R6/lib /usr/X11R6/lib64 /usr/X11R6/lib64/* ; do
         [ ! -d "$path" ] && continue
@@ -1505 +1505 @@
     [ ! -e "$boot_dev" ] && Die "Cannot find $boot_dev - is your Linux distro broken?"
     [ ! -e "$data_dev" ] && Die "Cannot find $data_dev - is your Linux distro broken?"
-    i=`find $imagesdir -type f | grep -F "/mindi-root.1" 2> /dev/null`
-    j=`find $imagesdir -type f | grep -F "/mindi-boot" | grep -Ev '2880|5760'`
+    find $imagesdir -type f > $MINDI_TMP/imagesdir.files
+    i=`grep -F "/mindi-root.1" $MINDI_TMP/imagesdir.files 2> /dev/null`
+    j=`grep -F "/mindi-boot" $MINDI_TMP/imagesdir.files | grep -Ev '2880|5760'`
     if [ "$i" ] ; then
         CopyImageToDisk $j $data_dev "boot disk"
@@ -1514 +1515 @@
     fi
     count=1
-    for i in `find $imagesdir | grep -F mindi-data` ; do
+    for i in `grep -F mindi-data $MINDI_TMP/imagesdir.files` ; do
         CopyImageToDisk $i $data_dev "data disk #$count"
         count=$(($count+1))
     done
+    rm -f $MINDI_TMP/imagesdir.files
 }