Changeset 2224 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-devices.c

Timestamp:

Jun 17, 2009, 4:43:35 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Add support of user for NFS write and fixes #316

File:

• branches/2.2.9/mondo/src/common/libmondo-devices.c (modified) (5 diffs)

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

@@ -1283 +1283 @@
     make_hole_for_dir(mountpoint);
 
-#ifndef __FreeBSD__
+#ifdef __FreeBSD__
     char *dev = NULL;
+#else
     char *options = NULL;
     mr_asprintf(&options, "ro");
@@ -1469 +1470 @@
 {
     char *tmp = NULL;
-    char *tmp1 = NULL;
     char *sz_size;
     char *command;
@@ -2053 +2053 @@
     log_it("isodir = %s", bkpinfo->isodir);
     log_it("nfs_mount = '%s'", bkpinfo->nfs_mount);
+    if (bkpinfo->nfs_user != NULL) {
+        log_it("nfs_user = '%s'", bkpinfo->nfs_user);
+    }
 #endif
 
@@ -2101 +2104 @@
     static char result_sz[1024];
 
-    mr_asprintf(exclude_these_directories,"%s",list_of_NFS_mounts_only());
-    mr_asprintf(exclude_these_devices,"%s",
+    mr_asprintf(&exclude_these_directories,"%s",list_of_NFS_mounts_only());
+    mr_asprintf(&exclude_these_devices,"%s",
            call_program_and_get_last_line_of_output
            ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|nfs4|smbfs|cifs|afs|gfs|ocfs|ocfs2|mvfs|nsspool|nsvol) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
-    snprintf(result_sz, "%s %s", exclude_these_directories,
-            exclude_these_devices, 1023);
+    snprintf(result_sz, 1023, "%s %s", exclude_these_directories, exclude_these_devices);
     mr_free(exclude_these_devices);
     mr_free(exclude_these_directories);
@@ -2129 +2131 @@
            call_program_and_get_last_line_of_output
            ("mount -t coda,ncpfs,nfs,nfs4,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
-    snprintf(result_sz, "%s", exclude_these_directories, 511);
+    snprintf(result_sz, 511, "%s", exclude_these_directories);
     mr_free(exclude_these_directories);
     return (result_sz);