Changeset 1082 in MondoRescue

Timestamp:

Jan 29, 2007, 11:49:33 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix to pb for mondo compilation
• again improve usage of find in mindi

Location:

branches/stable

Files:

• mindi/mindi (modified) (4 diffs)
• mondo/po/POTFILES.in (modified) (2 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (1 diff)

branches/stable/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
 }
 

branches/stable/mondo/po/POTFILES.in

@@ -17 +17 @@
 src/include/mr_str.h
 src/include/mr_gettext.h
+src/include/crcttt.h
 src/lib/mr_conf.c
 src/lib/mr_err.c
@@ -22 +23 @@
 src/lib/mr_str.c
 src/lib/mr_msg.c
-src/common/crcttt.h
 src/common/libmondo-mountlist.c
 src/common/libmondo-stream.h

branches/stable/mondo/src/common/libmondo-filelist.c

@@ -832 +832 @@
     log_msg(6, "Adding remaining chars ('%s')", string_to_add + 1);
     for (i = 1; i < noof_chars; i++) {
-            node->down = (struct s_node *) mr_malloc(sizeof(struct s_node));
-        }
+        node->down = (struct s_node *) mr_malloc(sizeof(struct s_node));
         node = node->down;
         char_to_add = string_to_add[i];