Changeset 2436 in MondoRescue

Timestamp:

Sep 29, 2009, 1:48:32 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Improve deplist.d/* files
• adds libnss for ssh support in boot disk
• Solve a memory management issue in DSF module (strtok => mr_strtok)
• DSF now also supports partitions in addition to full disks
• Adds debug in open_and_list_dir

Location:

branches/2.2.9

Files:

• mindi/deplist.d/base.conf (modified) (1 diff)
• mindi/deplist.d/minimal.conf (modified) (3 diffs)
• mindi/deplist.d/net.conf (modified) (1 diff)
• mindi/mindi (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (12 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (6 diffs)

branches/2.2.9/mindi/deplist.d/base.conf

@@ -32 +32 @@
 
 /usr/bin/bzip2
+# is a link => No additional place
 /usr/bin/bunzip2
 /usr/bin/lzop
+/usr/bin/lzma
 
+/bin/bash
 /bin/date
 /sbin/ctrlaltdel

branches/2.2.9/mindi/deplist.d/minimal.conf

@@ -7 +7 @@
 
 # Base Unix commands
-/bin/bash
 /bin/mt
 /bin/awk
@@ -18 +17 @@
 
 # Compression
-/bin/gunzip
 /bin/gzip
 
@@ -34 +32 @@
 /sbin/mount.fuse
 /usr/bin/fusermount
+/usr/bin/ssh
 # Required by ssh as dlopened
 /usr/lib/libnss_compat.so

branches/2.2.9/mindi/deplist.d/net.conf

@@ -6 +6 @@
 # SSH support
 /usr/sbin/sshd
-/usr/bin/ssh
 /usr/bin/scp
 

branches/2.2.9/mindi/mindi

@@ -2256 +2256 @@
         # We want to use the real mount and all the supported variants (nfs, cifs, ...)
         rm -f bin/mount $MINDI_TMP/busy.lis
-        mountlis=`grep -E "mount|fuse|ssh" $DEPLIST_FILE $DEPLIST_DIR/* | cut -d: -f2`
+        mountlis=`grep -E "mount|fuse|ssh|libnss" $DEPLIST_FILE $DEPLIST_DIR/* | cut -d: -f2`
         for f in $MINDI_LIB/rootfs/bin/busybox $mountlis ; do
             if [ -f $f ]; then

branches/2.2.9/mondo/src/common/libmondo-devices.c

@@ -1550 +1550 @@
     int i = 0;
     int mount_cnt = 0;
+    int lastpos = 0;
     char *mounted_file_system = NULL;
     char *command = NULL;
@@ -1580 +1581 @@
 
         log_msg (5, "mounted_file_system: %s", mounted_file_system);
-        if ((token = strtok(mounted_file_system, token_chars)) == NULL) {
+        if ((token = mr_strtok(mounted_file_system, token_chars, &lastpos)) == NULL) {
             log_msg (4, "Could not get the list of mounted file systems");
             paranoid_free(mounted_file_system);
@@ -1597 +1598 @@
             strcpy(DSFptr->device, token);
             mr_free(token);
-            if ((token = strtok(NULL, token_chars)) == NULL) {
+            if ((token = mr_strtok(mounted_file_system, token_chars, &lastpos)) == NULL) {
                 log_msg (5, "Ran out of entries on the mounted file systems list");
-                paranoid_free(mounted_file_system);
+                mr_free(mounted_file_system);
                 mr_free(token);
                 return (1);
@@ -1606 +1607 @@
             strcpy(DSFptr->mount_point, token);
             mr_free(token);
-            token = strtok(NULL, token_chars); 
-        }
-        paranoid_free(mounted_file_system);
+            token = mr_strtok(mounted_file_system, token_chars, &lastpos); 
+        }
+        mr_free(mounted_file_system);
     }
     /********
@@ -1644 +1645 @@
     char *mount_list = NULL;
     char *token = NULL;
+    char *ndsf = NULL;
     char token_chars[] =" \t\r\f\a\0";
     MOUNTED_FS_STRUCT *DSFptr = NULL;
@@ -1693 +1695 @@
     if (!strlen(partition_list)) {
         /* There were no partitions on the disk */
-        log_msg(4, "Cannot find any partitions on device special file %s", dsf);
-        return (-2);
-    }
-
-    /* Fill the partition list */
-    i = 0;
-    lastpos = 0;
-    while ((token = mr_strtok(partition_list, token_chars, &lastpos)) != NULL) {
-        log_msg (5, "Found partition: %s", token);
-        strcpy(partitions[i++], token);
-        mr_free(token);
-    }
-    paranoid_free(partition_list);
+        log_msg(4, "No partitions on device special file %s", dsf);
+        log_msg(4, "I guess it's a partiion itself");
+        strcpy(partitions[0], dsf);
+        ndsf = truncate_to_drive_name(dsf);
+    } else {
+        /* Fill the partition list */
+        i = 0;
+        lastpos = 0;
+        while ((token = mr_strtok(partition_list, token_chars, &lastpos)) != NULL) {
+            log_msg (5, "Found partition: %s", token);
+            strcpy(partitions[i++], token);
+            mr_free(token);
+        }
+        mr_asprintf(ndsf, "%s", dsf);
+    }
+    mr_free(partition_list);
   
+    /*  For the rest ndsf is the new dsf to deal with */
     /********
      * At this point, we have a list of all of the partitions on the dsf. Now try to
@@ -1740 +1746 @@
         /* See if it's swap. If it is, ignore it. */
         mr_asprintf(&command, "parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", 
-          dsf, partitions[i]);
+          ndsf, partitions[i]);
         log_msg(4, "  Running: %s", command);
         mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
@@ -1770 +1776 @@
         log_msg(4, "  It's not mounted. Checking to see if it's LVM...");
         /* Get the partition ID; 8e for LVM */
-        mr_asprintf(&command, "parted2fdisk -l %s |awk '{if($1 ~ \"^%s\"){print $5}}'", dsf, partitions[i]);
+        mr_asprintf(&command, "parted2fdisk -l %s |awk '{if($1 ~ \"^%s\"){print $5}}'", ndsf, partitions[i]);
         log_msg(4, "  Running: %s", command);
         mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
@@ -1809 +1815 @@
                      *******/
                     paranoid_free(mount_list);
+
                     mr_asprintf(&command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
                     log_msg (5, "Running: %s", command);
@@ -1890 +1897 @@
         }
         paranoid_free(tmp);
-    }
-    paranoid_free(partition_list);
-    paranoid_free(mount_list);
+        paranoid_free(mount_list);
+    }
 
     /* Determine how much memory to allocate for included_dsf_list and excluded_dsf_list */
@@ -1911 +1917 @@
     while (DSFptr != NULL) {
         if (DSFptr->check) {
-            log_msg (5, "%s is mounted on %s and is on disk %s\n", DSFptr->device, DSFptr->mount_point, dsf);
+            log_msg (5, "%s is mounted on %s and is on disk %s\n", DSFptr->device, DSFptr->mount_point, ndsf);
             strcat(*included_dsf_list, DSFptr->mount_point);
             strcat(*included_dsf_list, " ");
         } else {
-            log_msg (4, "%s is mounted on %s and is NOT on disk %s\n", DSFptr->device, DSFptr->mount_point, dsf);
+            log_msg (4, "%s is mounted on %s and is NOT on disk %s\n", DSFptr->device, DSFptr->mount_point, ndsf);
             strcat(*excluded_dsf_list, DSFptr->mount_point);
             strcat(*excluded_dsf_list, " ");
@@ -1921 +1927 @@
         DSFptr = DSFptr->next;
     }
+    mr_free(ndsf);
+
     log_msg (5, "included_dsf_list: %s", *included_dsf_list);
     log_msg (5, "excluded_dsf_list: %s", *excluded_dsf_list);

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

@@ -1350 +1350 @@
     /* dir is needed when we pass it to the shell */
     dir = mr_stresc(dir1, "`$\\\"(){}'[]&*?|!#~", '\\');
-    p = strrchr(dir, '/');
+    p = strrchr(dir1, '/');
     if (p) {
         if (!strcmp(p, "/.") || !strcmp(p, "/..")) {
@@ -1404 +1404 @@
                     g_skeleton_filelist, g_skeleton_filelist);
 //        log_msg(6, "fsm = %s", find_skeleton_marker);
-            run_program_and_log_output(find_skeleton_marker, 8);
+            paranoid_system(find_skeleton_marker);
             time(&this_time);
             if (this_time != last_time) {
@@ -1434 +1434 @@
         paranoid_free(tmp);
     } else if (strstr(skip_these, new_with_spaces)) {
+        log_msg(10, "Found dir ***%s**** excluded", dir1);
         fprintf(fout, "%s\n", dir1);    // if excluded dir then print dir ONLY
     } else {
+        log_msg(10, "Found dir ***%s**** parsed", dir1);
         fprintf(fout, "%s\n", dir1);
         while ((dit = readdir(dip)) != NULL) {
@@ -1448 +1450 @@
             if (strstr(skip_these, new_with_spaces)) {
                 fprintf(fout, "%s\n", new);
+                log_msg(10, "Found child dir ***%s**** excluded", new);
                 paranoid_free(new_with_spaces);
             } else {
@@ -1454 +1457 @@
                     if (!S_ISLNK(statbuf.st_mode)
                         && S_ISDIR(statbuf.st_mode)) {
+                        log_msg(10, "Found child dir ***%s**** parsed", new);
                         open_and_list_dir(new, skip_these, fout,
                                           time_of_last_full_backup);
@@ -1460 +1464 @@
                             || time_of_last_full_backup <
                             statbuf.st_ctime) {
+                            log_msg(10, "Found child file ***%s**** parsed", new);
                             fprintf(fout, "%s\n", new);
                             if ((counter++) > 128) {