Changeset 2444 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-cli.c

Timestamp:

Sep 30, 2009, 4:44:40 AM (15 years ago)

Author:

Bruno Cornec

Message:

• priority given to env var for tmpdir
• fuse FS excluded from tmpdir computation
• Improves udev timeout handling
• fuse device is needed at restore time for sshfs
• Avoids comment analysis in the new code handling deplist.d
• Avoids error message if some ssh conf files do not exist
• Improvements on sshfs/ssh management in restore mode
• Include now all minimal requirements for sshfs
• Fix udev support in init for Mandriva 2009.1 (udevadm settle is blocking)
• 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
• Improve user management for NetFS cases
• ssh in the restore env needs some dlopened libs (libnss_compat|files)
• Warning emited in case of duplicate mountpoints or devices in fstab found
• Use only the AWK veriable everywhere and not the awk command
• Simplify GetInitrdFilesystemToUse which doesn't need to detect everything, but just know if it's initramfs (new mode) or a compressed FS ext2/3 (older mode) as initrd is anyway re-made by mindi. Should fix #353

(Backport from 2.2.9)

File:

• branches/2.2.10/mondo/src/common/libmondo-cli.c (modified) (3 diffs)

branches/2.2.10/mondo/src/common/libmondo-cli.c

@@ -488 +488 @@
             *p = '\0';
         }
-        mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
+        mr_asprintf(tmp1, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
         mr_free(bkpinfo->isodir);
         bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp1);
@@ -506 +506 @@
                 retval++;
             } else {
-                mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
+                mr_asprintf(tmp1, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
                 mr_free(bkpinfo->isodir);
                 bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp1);
@@ -517 +517 @@
             }
         }
+        log_msg(3, "proto = %s", bkpinfo->netfs_proto);
         log_msg(3, "mount = %s", bkpinfo->netfs_mount);
+        if (bkpinfo->netfs_user) {
+            log_msg(3, "user = %s", bkpinfo->netfs_user);
+        }
         log_msg(3, "isodir= %s", bkpinfo->isodir);
     }