Changeset 3098 in MondoRescue

Timestamp:

Apr 26, 2013, 8:08:45 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Add cifs support for #208 with first modifications to add cifs support as an external FS

Location:

branches/3.0

Files:

• mindi/README.pxe (modified) (2 diffs)
• mindi/rootfs/sbin/start-netfs (modified) (1 diff)
• mondo-doc/mondoarchive.8 (modified) (1 diff)
• mondo/src/common/libmondo-cli.c (modified) (2 diffs)
• mondo/src/common/libmondo-devices.c (modified) (3 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (1 diff)

branches/3.0/mindi/README.pxe

@@ -11 +11 @@
 label mondo
         kernel vmlinuz-mondo
-        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=131072 selinux=0 rw root=/dev/ram iso acpi=off apm=off devfs=nomount exec-shield=0 pxe [proto=nfs|sshfs] [prefix=machine] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [hwaddr=M:A:C:A:D:R] [netfsmount=server:mountpoint] [netfsopt=-o option][netfspath=local_path] [ping=#] ...
+        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=131072 selinux=0 rw root=/dev/ram iso acpi=off apm=off devfs=nomount exec-shield=0 pxe [proto=nfs|sshfs|smbfs] [prefix=machine] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [hwaddr=M:A:C:A:D:R] [netfsmount=server:mountpoint] [netfsopt=-o option][netfspath=local_path] [ping=#] ...
 
 ipdev is the device name (e.g. eth2)
@@ -20 +20 @@
 dhcp is a keyword. Using it will provide all the previous 4 values to activate the LAN interface.
 hwaddr is the MAC address of the device you want to use to restore through
-proto is the protocol to use for mounting the remote share (default is NFS, sshfs is also available)
+proto is the protocol to use for mounting the remote share (default is NFS, sshfs and smbfs are also available)
 server is the ip addr of the Remote Network server
 mountpoint is the mount point on the Remote Network server to use (if NFS, should be in /etc/exports of the NFS server)

branches/3.0/mindi/rootfs/sbin/start-netfs

@@ -104 +104 @@
         ln -sf /dev/console /dev/tty
         sshfs -o ro,StrictHostKeyChecking=no $netfsopt $netfsmount /tmp/isodir
+    elif [ "$proto" = "smbfs" ]; then
+        LogIt "Mounting SMBFS share ($netfsmount) on /tmp/isodir..."
+        mount -t cifs $netfsopt $netfsmount /tmp/isodir -o ro 
     elif [ "$proto" != "" ]; then
         if [ -x /sbin/rpcbind ]; then

branches/3.0/mondo-doc/mondoarchive.8

@@ -127 +127 @@
 and mondoarchive will try to do its best to support it.
 Other protocols are available such as sshfs for fuse SSH based filesystem
-mount, with the same syntax e.g. 'sshfs://user@192.168.1.3:/home/nfs'
+mount, with the same syntax e.g. 'sshfs://user@192.168.1.3:/home/nfs' and
+smbfs (aka cifs) for SaMBa or Windows based filesystem mount.
 
 .TP

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

@@ -536 +536 @@
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
                     sprintf(tmp, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
+                    sprintf(tmp, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
                     sprintf(tmp, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
@@ -545 +547 @@
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
                     sprintf(tmp, "sshfs %s", bkpinfo->netfs_mount);
+                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
+                    sprintf(tmp, "mount -t cifs %s", bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
                     sprintf(tmp, "mount %s", bkpinfo->netfs_mount);

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

@@ -2174 +2174 @@
 {
     char *tmp = NULL;
+    char *tmpro = NULL;
     char *tmp1 = NULL;
     char *mds = NULL;
@@ -2528 +2529 @@
         strcpy(tmp1, bkpinfo->netfs_proto);
         if (!popup_and_get_string
-            ("Network protocol", "Which protocol should I use (nfs/sshfs) ?",
+            ("Network protocol", "Which protocol should I use (nfs/sshfs/smbfs) ?",
              tmp1, MAX_STR_LEN)) {
             log_to_screen("User has chosen not to backup the PC");
@@ -2567 +2568 @@
             sprintf(command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
+
             if (bkpinfo->restore_data) {
+                /*  mount th FS read-only in restore mode to avoid any erase of whatever */
+                mr_asprintf(&tmpro, "-o ro");
+            } else {
+                mr_asprintf(&tmpro, "");
+            }
+
+            /*  Build the mount string */
+            if (strstr(bkpinfo->netfs_proto, "smbfs")) {
+                mr_asprintf(&tmp, "mount -t cifs %s %s %s",bkpinfo->netfs_mount, bkpinfo->isodir,tmpro);
+                if (bkpinfo->netfs_user) {
+                    mr_strcat(tmp, " -o user=%s", bkpinfo->netfs_user);
+                }
+            else {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(&tmp, "sshfs -o ro");
+                    mr_asprintf(&tmp, "sshfs %s ",tmpro);
                 } else {
-                    mr_asprintf(&tmp, "mount -t %s -o nolock,ro", bkpinfo->netfs_proto);
+                    mr_asprintf(&tmp, "mount -t %s -o nolock %s ", bkpinfo->netfs_proto,tmpro);
                 }
-            } else {
-                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(&tmp, "sshfs");
-                } else {
-                    mr_asprintf(&tmp, "mount -t %s -o nolock", bkpinfo->netfs_proto);
+                if (bkpinfo->netfs_user) {
+                    mr_strcat(tmp, "%s@", bkpinfo->netfs_user);
                 }
-            }
-            mr_strcat(tmp, " ");
-            if (bkpinfo->netfs_user) {
-                mr_strcat(tmp, "%s@", bkpinfo->netfs_user);
-            }
-            mr_strcat(tmp, "%s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+                mr_strcat(tmp, "%s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+            }
             run_program_and_log_output(tmp, 3);
             mr_free(tmp);

branches/3.0/mondo/src/mondorestore/mondorestore.c

@@ -3134 +3134 @@
                             bkpinfo->netfs_mount);
                     }
-                } else {
-                    if (bkpinfo->netfs_user) {
-                        sprintf(tmp, "mount %s@%s -o nolock,ro /tmp/isodir",
-                            bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                } else  {
+                    if (strstr(bkpinfo->netfs_proto, "smbfs")) {
+                        if (bkpinfo->netfs_user) {
+                            sprintf(tmp, "mount -t cifs %s /tmp/isodir -o user=%s,nolock,ro ",
+                                bkpinfo->netfs_mount,bkpinfo->netfs_user);
+                        } else {
+                            sprintf(tmp, "mount -t cifs %s /tmp/isodir -o nolock,ro ",
+                                bkpinfo->netfs_mount);
+                        }
                     } else {
-                        sprintf(tmp, "mount %s -o nolock,ro /tmp/isodir",
-                            bkpinfo->netfs_mount);
+                        if (bkpinfo->netfs_user) {
+                            sprintf(tmp, "mount %s@%s -o nolock,ro /tmp/isodir",
+                                bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                        } else {
+                            sprintf(tmp, "mount %s -o nolock,ro /tmp/isodir",
+                                bkpinfo->netfs_mount);
+                        }
                     }
                 }