Changeset 764 in MondoRescue for trunk/mondo/mondo/mondorestore

Timestamp:

Aug 8, 2006, 12:34:37 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r728:763 $SVN_M/branches/stable

Location:

trunk/mondo/mondo/mondorestore

Files:

• mondo-prep.c (modified) (1 diff)
• mondo-rstr-newt.c (modified) (6 diffs)
• mondo-rstr-tools.c (modified) (1 diff)

trunk/mondo/mondo/mondorestore/mondo-prep.c

@@ -2190 +2190 @@
 #else
     asprintf(&program, "raidstart %s", raid_device);
-//      sprintf (program, "raidstart " RAID_DEVICE_STUB "*");
 #endif
     log_msg(1, "program = %s", program);

trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

@@ -883 +883 @@
     static int lines_in_flist_window = 0;
     static int depth = 0;
-    int i = 0;
+
+    /** long **************************************************************/
+    long i = 0;
 
     /** structures *******************************************************/
@@ -1363 +1365 @@
     paranoid_free(size_str);
 
-    newtListboxSetEntry(listbox, (int) keylist[currline],
+    newtListboxSetEntry(listbox, (long) keylist[currline],
                         mountlist_entry_to_string(mountlist, currline));
     /* if new /dev/md RAID device then do funky stuff */
@@ -2489 +2491 @@
 {
 
-    /** int *************************************************************/
-    int i = 0;
+    /** long **************************************************************/
+    long i = 0;
 
     assert(disklist != NULL);
@@ -2521 +2523 @@
 {
 
-    /** int **************************************************************/
-    int i = 0;
+    /** long **************************************************************/
+    long i = 0;
 
     assert(mountlist != NULL);
@@ -2554 +2556 @@
 {
 
-    /** int **************************************************************/
-    int i = 0;
+    /** long *************************************************************/
+    long i = 0;
 
     /** buffers **********************************************************/
@@ -2590 +2592 @@
                 void *keylist[], newtComponent listbox)
 {
-    /** int *************************************************************/
-    int i = 0;
+    /** long ************************************************************/
+    long i = 0;
 
     /** buffers *********************************************************/

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -2155 +2155 @@
     asprintf(&command, "mount /dev/fd0u1722 %s", mountpt);
     asprintf(&tmp,
-            "(sleep 15; kill `ps ax | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
+            "(sleep 15; kill `ps | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
             command);
     log_msg(1, "tmp = '%s'", tmp);