Changeset 2382 in MondoRescue

Timestamp:

Sep 10, 2009, 2:07:16 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Change NFS support into a NetFS support to allow for multiple protocol in addition to NFS (NEEDS TESTING)

(Backport from 2.2.9)

Location:

branches/2.2.10

Files:

• mindi/README.pxe (modified) (4 diffs)
• mindi/deplist.txt (modified) (1 diff)
• mindi/mindi (modified) (6 diffs)
• mindi/rootfs/sbin/init (modified) (5 diffs)
• mindi/rootfs/sbin/start-netfs (copied) (copied from branches/2.2.9/mindi/rootfs/sbin/start-netfs ) (1 diff)
• mindi/rootfs/sbin/start-nfs (deleted)
• mondo-doc/mondoarchive.8 (modified) (2 diffs)
• mondo-doc/mondorescue-howto.sgml (modified) (3 diffs)
• mondo-doc/mondorestore.8 (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (5 diffs)
• mondo/src/common/libmondo-cli.c (modified) (16 diffs)
• mondo/src/common/libmondo-devices-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (21 diffs)
• mondo/src/common/libmondo-devices.h (modified) (1 diff)
• mondo/src/common/libmondo-filelist.c (modified) (2 diffs)
• mondo/src/common/libmondo-files-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-files.c (modified) (3 diffs)
• mondo/src/common/libmondo-files.h (modified) (1 diff)
• mondo/src/common/libmondo-fork.c (modified) (1 diff)
• mondo/src/common/libmondo-mountlist.c (modified) (2 diffs)
• mondo/src/common/libmondo-string.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (6 diffs)
• mondo/src/common/libmondo-verify.c (modified) (2 diffs)
• mondo/src/common/mondostructures.h (modified) (2 diffs)
• mondo/src/common/newt-specific.c (modified) (7 diffs)
• mondo/src/include/my-stuff.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-newt.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (8 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (4 diffs)
• mondo/src/mondorestore/mr-externs.h (modified) (1 diff)

branches/2.2.10/mindi/README.pxe

@@ -11 +11 @@
 label mondo
         kernel vmlinuz-mondo
-        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=131072 rw root=/dev/ram iso acpi=off apm=off devfs=nomount exec-shield=0 pxe [prefix=machine] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [nfsmount=server:mountpoint] [nfspath=local_path] [ping=#] ...
+        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=131072 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)] [netfsmount=server:mountpoint] [netfspath=local_path] [ping=#] ...
 
 ipdev is the device name (e.g. eth2)
@@ -19 +19 @@
 gateway is the default gateway (e.g. 192.168.1.254)
 dhcp is a keyword. Using it will provide all the previous 4 values to activate the LAN interface.
-server is the ip addr of the NFS server
-mountpoint is the mount point on the NFS server to use (should be in /etc/exports of the NFS server)
+proto is the protocol to use for mounting the remote share (default is NFS, sshfs is 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)
+netfsmount is the server and mountpoint on which the ISO is available, if different from the one at backup time. For SSHFS the server part can be of the form user@server.
+netfspath is the local path on the remote server where the image is located, if different from the one at backup time.
 local_path is the local directory under which the mage was made (with the -d option)
 rmadisk_size may have to be increase to 131072 on more recent distributions such as rhel 5
@@ -40 +43 @@
 Without prefix keyword, the name of the images used during archiving with the -p option will be used (they may differ). If -p wasn't used then the name mondorescue-1.iso, ... will be used.
 
-During boot mondorestore will start your NFS configuration and mount mondo's content from the network rather than from a physical media. You may alter the IP configuration stored from the original machine by passing the ipconf option describing respectively the IP address, netmask, broadcast and default gateway you want to setup for the machine, separated by ':'. Or alternatively, you may specify the dhcp keyword so that a DHCP request is made to get those information. In the 2 cases, you have to mention on which physical interface those parameters should apply. On some configurations, you may also want to increase the number of ping queries made before the NFS mount, which is of 3 by default, using the ping option and give the number you want. If you have a different NFS server for the deployment than for the archiving, you can also precise it through the nfsmount option. The structure on both server under the mountpoint has to be the same.
+During boot mondorestore will start your NFS configuration and mount mondo's content from the network rather than from a physical media. You may alter the IP configuration stored from the original machine by passing the ipconf option describing respectively the IP address, netmask, broadcast and default gateway you want to setup for the machine, separated by ':'. Or alternatively, you may specify the dhcp keyword so that a DHCP request is made to get those information. In the 2 cases, you have to mention on which physical interface those parameters should apply. On some configurations, you may also want to increase the number of ping queries made before the NFS mount, which is of 3 by default, using the ping option and give the number you want. If you have a different NFS server for the deployment than for the archiving, you can also precise it through the netfsmount option. The structure on both server under the mountpoint has to be the same.
 
 CAVEAT: the limit to the number of char on the append line is 255. Use symlinks to reduce the size of your path if needed.
@@ -46 +49 @@
 Please report any problem around that tool to bruno@mondorescue.org
 
+2009-09-09 Changed to netfs for multi protocol support (nfs, sshfs, ...)
 2009-05-07 nfspath added to allow redeployment from another NFS directory
 2006-06-10 nfsmount added to allow redeployment from another NFS server

branches/2.2.10/mindi/deplist.txt

@@ -46 +46 @@
 /bin/mount
 /sbin/mount.nfs /sbin/mount.nfs4 
-/sbin/mount.fuse
+/usr/bin/sshfs 
+/sbin/mount.fuse /usr/bin/fusermount /usr/bin/ulockmgr_server
 /sbin/mount.cifs /sbin/mount.cifs3
 /sbin/mount.smb /sbin/mount.smb3

branches/2.2.10/mindi/mindi

@@ -57 +57 @@
 PCMCIA_MODS="pcmcia_core ds yenta_socket"
 USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_storage input hid uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd usbkbd usbhid keybdev mousedev libusual scsi_mod ff-memless"
-NET_MODS="sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 e1000 e1000e igb eepro100 ne2k-pci tg3 libphy pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmnet exportfs"
+NET_MODS="sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 e1000 e1000e igb eepro100 ne2k-pci tg3 libphy pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmnet exportfs fuse"
 CDROM_MODS="$TAPE_MODS $IDE_MODS $USB_MODS $PCMCIA_MODS $SCSI_MODS $NET_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_base nls_cp437 nls_utf8 sg sr_mod zlib_inflate iso9660"
 # Those modules will only go on the backup media, not the boot media.
-EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid10 raid5 raid456 lvm-mod dm-mod dm_mod dm-snapshot dm_snapshot dm-zero dm_zero dm-mirror dm_mirror dm-multipath dm-round-robin dm-emc dm-hp-sw dm-rdac multipath jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache ext4 jbd2 crc16 fuse"
+EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid10 raid5 raid456 lvm-mod dm-mod dm_mod dm-snapshot dm_snapshot dm-zero dm_zero dm-mirror dm_mirror dm-multipath dm-round-robin dm-emc dm-hp-sw dm-rdac multipath jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache ext4 jbd2 crc16"
 # Replace with that line for HP OCMP e.g.
 #DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu fdomain"
@@ -565 +565 @@
         fi
         cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2>> $LOGFILE || LogAll "\nMondo v1.2x defaults to LILO as the bootloader, BTW."
-        if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
+        if [ -e "$MINDI_TMP/NETFS-DEV" ] ; then
             LogAll "\nIncorporating NFS-related settings"
-            for r in NFS-* ISO-PREFIX ; do
+            for r in NETFS-* ISO-PREFIX ; do
                 cp -f $MINDI_TMP/$r $bigdir/tmp 2>> $LOGFILE || Die "Cannot copy $r - did you run out of disk space?"
                 LogFile "Copying $r to ramdisk" 
@@ -923 +923 @@
     echo "datestamp `date`" >> $outfile
     [ "$ESTIMATED_TOTAL_NOOF_SLICES" ] && echo "total-slices $ESTIMATED_TOTAL_NOOF_SLICES" >> $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NFS-CLIENT-IPADDR nfs-client-ipaddr $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NFS-CLIENT-NETMASK nfs-client-netmask $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NFS-CLIENT-BROADCAST nfs-client-broadcast $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NFS-CLIENT-DEFGW  nfs-client-defgw  $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NFS-SERVER-MOUNT  nfs-server-mount  $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NFS-SERVER-PATH   nfs-server-path   $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NFS-DEV           nfs-dev           $outfile
-    AddFileToCfgIfExists $MINDI_TMP/NFS-SERVER-IPADDR nfs-server-ipaddr $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-IPADDR netfs-client-ipaddr $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-NETMASK netfs-client-netmask $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-BROADCAST netfs-client-broadcast $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-CLIENT-DEFGW  netfs-client-defgw  $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-MOUNT  netfs-server-mount  $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-PATH   netfs-server-path   $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-DEV           netfs-dev           $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-PROTO         netfs-proto           $outfile
+    AddFileToCfgIfExists $MINDI_TMP/NETFS-SERVER-IPADDR netfs-server-ipaddr $outfile
     AddFileToCfgIfExists $MINDI_TMP/ISO-DEV           iso-dev           $outfile
     AddFileToCfgIfExists $MINDI_TMP/ISO-MNT           iso-mnt           $outfile
@@ -1511 +1512 @@
     if [ _"$MONDO_SHARE" != _"" ]; then
         if [ "$CDRECOVERY" != "yes" ] ; then
-            if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
+            if [ -e "$MINDI_TMP/NETFS-DEV" ] ; then
                 echo -en "Press <enter> to continue.\n"
             elif [ ! "$MINDI_TMP" ] ; then
@@ -1554 +1555 @@
     # In case it's mondoarchive
     elif [ _"$MONDO_SHARE" != _"" ]; then
-        if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
+        if [ -e "$MINDI_TMP/NETFS-DEV" ] ; then
             echo -en "default${sep}iso\n"
         else
@@ -2341 +2342 @@
     list_of_groovy_mods="$CDROM_MODS $FORCE_MODS"
 
-    if [ -e "$MINDI_TMP/NFS-DEV" ] ; then
+    if [ -e "$MINDI_TMP/NETFS-DEV" ] ; then
         # For PXE boot
         list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"

branches/2.2.10/mindi/rootfs/sbin/init

@@ -724 +724 @@
 fi
 if [ "`grep -i pxe $CMDLINE`" ] || [ "`grep -i net $CMDLINE`" ]; then
-    # We need to get here exported variables from start-nfs
-    . /sbin/start-nfs
+    # We need to get here exported variables from start-netfs
+    . /sbin/start-netfs
 fi
 
@@ -737 +737 @@
     ExtractDataDisksAndLoadModules
     # Fake the conf file to force it to NFS mode, even if we made originally a CD (mandatory for mondorestore to work correctly)
-    sed -i "s/backup-media-type.*/backup-media-type nfs/" /tmp/mondo-restore.cfg
+    sed -i "s/backup-media-type.*/backup-media-type netfs/" /tmp/mondo-restore.cfg
 elif [ "`grep -i usb= $CMDLINE`" ] || [ "`grep -i usb /tmp/mondo-restore.cfg 2>/dev/null | grep media-type`" ]; then
     . /sbin/start-usb
@@ -748 +748 @@
     HandleCDROM
     ExtractDataDisksAndLoadModules
-    # We need to get here exported variables from start-nfs
-    . /sbin/start-nfs
+    # We need to get here exported variables from start-netfs
+    . /sbin/start-netfs
 fi
 res=$?
@@ -848 +848 @@
     LogIt "backup-media-type is specified in config file - great."
     LogIt "Calling post-init"
-    # start-nfs moved it under /tmp as the NFS share is already unmounted 
+    # start-netfs moved it under /tmp as the NFS share is already unmounted 
     if [ "`echo $pre | grep -E '^/tmp/isodir'`" ]; then
         post=`echo $pre | sed 's|^/tmp/isodir|/tmp|'`
@@ -866 +866 @@
         echo $i | grep -qi post= && post=`echo $i | cut -d= -f2`
     done
-    # start-nfs moved it under /tmp as the NFS share is already unmounted 
+    # start-netfs moved it under /tmp as the NFS share is already unmounted 
     if [ "`echo $post | grep -E '^/tmp/isodir'`" ]; then
         post=`echo $post | sed 's|^/tmp/isodir|/tmp|'`

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

@@ -31 +31 @@
 
 # info from cmdline are predominent
-for i in `cat /proc/cmdline` ; do
+for i in `cat $CMDLINE` ; do
     echo $i | grep -qi ping= && ipcount=`echo $i | cut -d= -f2`
     echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`

branches/2.2.10/mondo-doc/mondoarchive.8

@@ -119 +119 @@
 .TP
 .BI "-n " mount
-Use files residing on NFS partition as backup media.
+Use files residing on a remote share as backup media.
 .I mount
-is the remote mount-point, e.g. '192.168.1.3:/home/nfs'
+is the remote mount-point, e.g. 'nfs://192.168.1.3:/home/nfs'
 for my file server. If not mounted, mondoarchive will do it for you. So nice ;-)
 If your NFS server only accept write from a backup user, you may specify it with the syntax:
-.B user@machine:/mount/path
+.B nfs://user@machine:/mount/path
 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'
 
 .TP
@@ -426 +428 @@
 Backup to an NFS mount:
 .br
-.I "mondoarchive -On 192.168.1.2:/home/nfs -d /Monday -E /mnt/nfs"
+.I "mondoarchive -On nfs://192.168.1.2:/home/nfs -d /Monday -E /mnt/nfs"
 
 Verify existing NFS backup:-
 .br
-.I "mondoarchive -Vn 192.168.1.2:/home/nfs -d /Monday"
+.I "mondoarchive -Vn nfs://192.168.1.2:/home/nfs -d /Monday"
 
 .BI USB:

branches/2.2.10/mondo-doc/mondorescue-howto.sgml

@@ -560 +560 @@
 <row>
 <entry>
-        bash# mount 192.168.1.28:/home/nfs /mnt/nfs
+        bash# mount nfs://192.168.1.28:/home/nfs /mnt/nfs
         </entry>
 </row>
 <row>
 <entry>
-bash# mondoarchive -OVn 192.168.1.28:/home/nfs -gF[...]
+        bash# mondoarchive -OVn nfs://192.168.1.28:/home/nfs -gF[...]
         </entry>
 </row>
@@ -1508 +1508 @@
 <entry>
 
-        bash# mount 192.168.1.3:/home/nfs -t nfs /mnt/nfs
+        bash# mount nfs://192.168.1.3:/home/nfs -t nfs /mnt/nfs
 </entry>
 </row>
 <row>
         <entry>
-        bash# mondoarchive -OVn 192.168.1.3:/home/nfs -g -s 200m
+        bash# mondoarchive -OVn nfs://192.168.1.3:/home/nfs -g -s 200m
 </entry>
 </row>
@@ -3119 +3119 @@
 <entry>
 
-bash# mondoarchive -On 192.168.1.3:/home/nfs
+        bash# mondoarchive -On nfs://192.168.1.3:/home/nfs
 
 </entry>

branches/2.2.10/mondo-doc/mondorestore.8

@@ -62 +62 @@
 Use files residing on NFS partition as restore media.
 .I mount
-is the remote mount-point, e.g. '192.168.1.3:/home/nfs'
+is the remote mount-point, e.g. nfs://192.168.1.3:/home/nfs'
 for my file server. Please mount it before restoring/verifying.
 

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

@@ -759 +759 @@
         mr_asprintf(value, "iso");
         break;
-    case nfs:
-        mr_asprintf(value, "nfs");
+    case netfs:
+        mr_asprintf(value, "netfs");
         break;
     case dvd:
@@ -824 +824 @@
     }
 
-    estimated_total_noof_slices =
-        size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
-    /* BERLIOS: add nfs stuff here? */
+    estimated_total_noof_slices = size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
+
+    /* BERLIOS: add netfs stuff here? */
     mr_asprintf(command, "mkdir -p %s/images", bkpinfo->scratchdir);
     if (system(command)) {
@@ -1218 +1218 @@
 
     if ((bkpinfo->isodir != NULL) && (bkpinfo->prefix != NULL)) {
-        if (bkpinfo->nfs_remote_dir) {
+        if (bkpinfo->netfs_remote_dir) {
             // NFS
-            mr_asprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix);
+            mr_asprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix);
         } else {
             // ISO
@@ -3131 +3131 @@
  * - @c manual_cd_tray
  * - @c media_size
- * - @c nfs_mount
- * - @c nfs_remote_dir
+ * - @c netfs_mount
+ * - @c netfs_remote_dir
  * - @c scratchdir
  * - @c verify_data
@@ -3203 +3203 @@
         log_to_screen("Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.", (long) space_occupied_by_cd(bkpinfo->scratchdir), (long) bkpinfo->media_size[g_current_media_number]);
     }
-    if (((bkpinfo->isodir == NULL) && (bkpinfo->nfs_remote_dir == NULL)) || (bkpinfo->prefix == NULL)) {
+    if (((bkpinfo->isodir == NULL) && (bkpinfo->netfs_remote_dir == NULL)) || (bkpinfo->prefix == NULL)) {
         fatal_error("Something wrong in your environement. Report to dev team");
     }
-    if (bkpinfo->nfs_remote_dir) {
-        // NFS
-        mr_asprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+    if (bkpinfo->netfs_remote_dir) {
+        // Network
+        mr_asprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
     } else {
         // ISO
         mr_asprintf(isofile, "%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
     }
+
     for (that_one_was_ok = FALSE; !that_one_was_ok;) {
         if (bkpinfo->backup_media_type != usb) {

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

@@ -55 +55 @@
 static void free_mounted_fs_list (void);
 static int get_dsf_mount_list (const char *dsf, char **included_dsf_list, char **excluded_dsf_list);
-static int create_list_of_non_NFS_mounted_file_systems (void);
+static int create_list_of_non_NETFS_mounted_file_systems (void);
 static MOUNTED_FS_STRUCT *find_mount_point_in_list (const char *mount_point);
 static MOUNTED_FS_STRUCT *find_device_in_list (const char *device);
@@ -162 +162 @@
 /**
  * Frees the memory for all of the structures on the linked list of 
- * all of the non-NFS mounted file systems.
+ * all of the non-NETFS mounted file systems.
  */
 static void free_mounted_fs_list (void) {
@@ -179 +179 @@
 
 /**
- * Creates a singly linked list of all of the non-NFS mounted file systems.
+ * Creates a singly linked list of all of the non-NETFS mounted file systems.
  * @param DSFptr A pointer  to the structure MOUNTED_FS_STRUCT used to hold 
  * the list of mounted file systems. 
@@ -197 +197 @@
 
 /**
- * Find the structure, in the singly linked list of all of the non-NFS 
+ * Find the structure, in the singly linked list of all of the non-NETFS 
  * mounted file systems, that contains the specified device.
  * @param device The device to find 
@@ -218 +218 @@
 
 /**
- * Find the structure, in the singly linked list of all of the non-NFS 
+ * Find the structure, in the singly linked list of all of the non-NETFS 
  * mounted file systems, that contains the specified mount point.
  * @param mount_point The mount point to find 
@@ -239 +239 @@
 
 /**
- * Creates a linked list of all of the non-NFS mounted file systems.
+ * Creates a linked list of all of the non-NETFS mounted file systems.
  * We use a linked list because we don't know how many  mounted file
  * there are (and there can be a lot).
  * @return 0 on success and greated than 0 on failure. 
  */
-static int create_list_of_non_NFS_mounted_file_systems (void)
+static int create_list_of_non_NETFS_mounted_file_systems (void)
 {
     int i = 0;
@@ -372 +372 @@
 
     /* Get a list of the mounted file systems */
-    if (create_list_of_non_NFS_mounted_file_systems()) {
+    if (create_list_of_non_NETFS_mounted_file_systems()) {
         log_to_screen ("Could not get the list of mounted file systems");
         return (1);
@@ -967 +967 @@
 
     if (flag_set['n']) {
-        mr_free(bkpinfo->nfs_mount);
-        mr_asprintf(bkpinfo->nfs_mount, "%s", flag_val['n']);
+        mr_free(bkpinfo->netfs_mount);
+        mr_asprintf(bkpinfo->netfs_mount, "%s", flag_val['n']);
         if (!flag_set['d']) {
-            mr_free(bkpinfo->nfs_remote_dir);
-            mr_asprintf(bkpinfo->nfs_remote_dir, "/");
-        }
-        /* test if we specified a user for the NFS dialog */
-        p = strchr(bkpinfo->nfs_mount, '@');
+            mr_free(bkpinfo->netfs_remote_dir);
+            mr_asprintf(bkpinfo->netfs_remote_dir, "/");
+        }
+        /* test for protocol */
+        p = strchr(bkpinfo->netfs_mount, ':');
+        if (p == NULL) {
+            /* protocol not found abort */
+            fatal_error("No protocol specified for remote share mount. Please do man mondoarchive as syntax changed");
+        } else {
+            /* Proto found. Store the 2 values */
+            bkpinfo->netfs_proto = bkpinfo->netfs_mount;
+            p++;
+            if (*p != '/') {
+                fatal_error("No protocol correctly specified for remote share mount. Use protocol://server:share");
+            }
+            p++;
+            if (*p != '/') {
+                fatal_error("No protocol correctly specified for remote share mount. Use protocol://server:share");
+            }
+            bkpinfo->netfs_mount = p;
+            /* new netfs mount - remove :// from proto */
+            p--;
+            p--;
+            p--;
+            *p = '\0';
+        }
+        /* test if we specified a user */
+        p = strchr(bkpinfo->netfs_mount, '@');
         if (p != NULL) {
             /* User found. Store the 2 values */
-            bkpinfo->nfs_user = bkpinfo->nfs_mount;
+            bkpinfo->netfs_user = bkpinfo->netfs_mount;
             p++;
-            /* new NFS mount */
-            bkpinfo->nfs_mount = p;
+            /* new netfs mount */
+            bkpinfo->netfs_mount = p;
             p--;
             *p = '\0';
         }
-        mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount);
+        mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
         mr_free(bkpinfo->isodir);
         mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output(tmp1));
@@ -990 +1013 @@
 
         if (strlen(bkpinfo->isodir) < 3) {
-            log_to_screen("NFS share is not mounted. Trying to mount it for you.\n");
-            mr_asprintf(tmp1, "mount %s", bkpinfo->nfs_mount);
+            log_to_screen("Network share is not mounted. Trying to mount it for you.\n");
+            if (strstr(bkpinfo->netfs_proto, "sshfs")) {
+                mr_asprintf(tmp1, "sshfs %s", bkpinfo->netfs_mount);
+            } else {
+                mr_asprintf(tmp1, "mount %s", bkpinfo->netfs_mount);
+            }
             i = system(tmp1);
             mr_free(tmp1);
             if (i) {
-                log_to_screen("Unable to mount NFS share %s. Please mount manually.\n", bkpinfo->nfs_mount);
+                log_to_screen("Unable to mount Network share %s. Please mount manually.\n", bkpinfo->netfs_mount);
                 retval++;
             } else {
-                mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount);
+                mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
                 mr_free(bkpinfo->isodir);
                 mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output(tmp1));
@@ -1005 +1032 @@
                 if (strlen(bkpinfo->isodir) < 3) {
                     retval++;
-                    log_to_screen("NFS share %s is strangely not mounted. Please mount manually...\n", bkpinfo->nfs_mount);
+                    log_to_screen("Network share %s is strangely not mounted. Please mount manually...\n", bkpinfo->netfs_mount);
                 }
             }
         }
-        log_msg(3, "mount = %s", bkpinfo->nfs_mount);
+        log_msg(3, "mount = %s", bkpinfo->netfs_mount);
         log_msg(3, "isodir= %s", bkpinfo->isodir);
     }
@@ -1023 +1050 @@
     }
     if (flag_set['n']) {
-        bkpinfo->backup_media_type = nfs;
-        /* Never try to eject a NFS device */
+        bkpinfo->backup_media_type = netfs;
+        /* Never try to eject a Network device */
         bkpinfo->please_dont_eject = TRUE;
     }
@@ -1134 +1161 @@
     }
 
-    if ((flag_set['N']) && (! bkpinfo->restore_data))       // exclude NFS mounts & devices
+    if ((flag_set['N']) && (! bkpinfo->restore_data))       // exclude Network mounts & devices
     {
-        mr_asprintf(psz, "%s", list_of_NFS_mounts_only());
+        mr_asprintf(psz, "%s", list_of_NETFS_mounts_only());
         mr_strcat(bkpinfo->exclude_paths, " %s ", psz);
         mr_free(psz);
@@ -1201 +1228 @@
     }
 
-    if (flag_set['d']) {        /* backup directory (if ISO/NFS) */
+    if (flag_set['d']) {        /* backup directory (if ISO/NETFS) */
         if (flag_set['i']) {
             mr_free(bkpinfo->isodir);
@@ -1212 +1239 @@
             mr_free(tmp1);
         } else if (flag_set['n']) {
-            mr_free(bkpinfo->nfs_remote_dir);
-            mr_asprintf(bkpinfo->nfs_remote_dir, "%s", flag_val['d']);
+            mr_free(bkpinfo->netfs_remote_dir);
+            mr_asprintf(bkpinfo->netfs_remote_dir, "%s", flag_val['d']);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
             mr_free(bkpinfo->media_device);
@@ -1221 +1248 @@
 
     if ((flag_set['n']) && (! bkpinfo->restore_data)) {
-        mr_asprintf(tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->nfs_remote_dir);
-        if (bkpinfo->nfs_user) {
-            mr_asprintf(tmp2, "su - %s -c \"echo hi > %s\"", bkpinfo->nfs_user, tmp1);
+        mr_asprintf(tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->netfs_remote_dir);
+        if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
+            mr_asprintf(tmp2, "su - %s -c \"echo hi > %s\"", bkpinfo->netfs_user, tmp1);
         } else {
             mr_asprintf(tmp2, "echo hi > %s", tmp1);
@@ -1232 +1259 @@
         if (i) {
             retval++;
-            log_to_screen(tmp2, "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
+            log_to_screen(tmp2, "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->netfs_remote_dir, bkpinfo->netfs_mount);
         }
         unlink(tmp1);

branches/2.2.10/mondo/src/common/libmondo-devices-EXT.h

@@ -46 +46 @@
 extern int eject_device(char *);
 
-extern char *list_of_NFS_devices_and_mounts();
-extern char *list_of_NFS_mounts_only(void);
+extern char *list_of_NETFS_devices_and_mounts();
+extern char *list_of_NETFS_mounts_only(void);
 
 extern void sensibly_set_scratchdir();

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

@@ -54 +54 @@
  */
 bool g_restoring_live_from_cd = FALSE;
-bool g_restoring_live_from_nfs = FALSE;
+bool g_restoring_live_from_netfs = FALSE;
 
 extern t_bkptype g_backup_media_type;   // set by main()
@@ -164 +164 @@
         mr_asprintf(output, "cdstream");
         break;
-    case nfs:
-        mr_asprintf(output, "nfs");
+    case netfs:
+        mr_asprintf(output, "netfs");
         break;
     case tape:
@@ -1298 +1298 @@
     mr_free(tmp);
 
-    if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso || bkpinfo->backup_media_type == nfs) {
+    if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso || bkpinfo->backup_media_type == netfs) {
         // BERLIOS --- I'm tempted to do something about this...
         // Why unmount and remount again and again?
@@ -1310 +1310 @@
         mr_free(tmp);
 
-        if (((bkpinfo->isodir == NULL) && (bkpinfo->nfs_remote_dir == NULL)) || (bkpinfo->prefix == NULL)) {
+        if (((bkpinfo->isodir == NULL) && (bkpinfo->netfs_remote_dir == NULL)) || (bkpinfo->prefix == NULL)) {
             fatal_error("Unable to prepare ISO file name. Please report to dev team");
         }
-        if (bkpinfo->nfs_remote_dir) {
-            // NFS
-            mr_asprintf(tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
+        if (bkpinfo->netfs_remote_dir) {
+            // NETFS
+            mr_asprintf(tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
         } else {
             // ISO
@@ -1322 +1322 @@
         if (!does_file_exist(tmp)) {
             mr_free(tmp);
-            if (bkpinfo->nfs_remote_dir) {
-                // NFS
-                mr_asprintf(tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
+            if (bkpinfo->netfs_remote_dir) {
+                // NETFS
+                mr_asprintf(tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
             } else {
                 // ISO
@@ -1413 +1413 @@
     bkpinfo->nonbootable_backup = FALSE;
 
-    // Tape, CD, NFS, ...?
+    // Tape, CD, NETFS, ...?
     srandom(getpid());
     bkpinfo->backup_media_type =
@@ -1647 +1647 @@
 
 
-    case nfs:
-        /* Never try to eject a NFS device */
+    case netfs:
+        /* Never try to eject a NETFS device */
         bkpinfo->please_dont_eject = TRUE;
 
-        /* Initiate bkpinfo nfs_mount path from running environment if not already done */
-        if (bkpinfo->nfs_mount == NULL) {
-            mr_asprintf(bkpinfo->nfs_mount, "%s", call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
+        /* Initiate bkpinfo netfs_mount path from running environment if not already done */
+        if (bkpinfo->netfs_mount == NULL) {
+            mr_asprintf(bkpinfo->netfs_mount, "%s", call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
         }
 #ifdef __FreeBSD__
@@ -1661 +1661 @@
 #endif
         {
-            p = popup_and_get_string("NFS dir.", "Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)", bkpinfo->nfs_mount);
+            p = popup_and_get_string("Network shared dir.", "Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)", bkpinfo->netfs_mount);
             if (p == NULL) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
-            mr_free(bkpinfo->nfs_mount);
-            bkpinfo->nfs_mount = p;
+            mr_free(bkpinfo->netfs_mount);
+            bkpinfo->netfs_mount = p;
             if (!bkpinfo->restore_data) {
                 if ((bkpinfo->compression_level =
@@ -1677 +1677 @@
             // check whether already mounted - we better remove
             // surrounding spaces and trailing '/' for this
-            mr_strip_spaces(bkpinfo->nfs_mount);
-            if (bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] == '/')
-                bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0';
-            mr_asprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", bkpinfo->nfs_mount);
+            mr_strip_spaces(bkpinfo->netfs_mount);
+            if (bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] == '/')
+                bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] = '\0';
+            mr_asprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", bkpinfo->netfs_mount);
             mr_free(bkpinfo->isodir);
             mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output(command));
@@ -1711 +1711 @@
             mr_free(command);
 
-            p = popup_and_get_string("NFS share", "Which remote NFS share should I mount?", bkpinfo->nfs_mount);
+            p = popup_and_get_string("Network share", "Which remote Network share should I mount?", bkpinfo->netfs_mount);
             if (p == NULL) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
-            mr_free(bkpinfo->nfs_mount);
-            bkpinfo->nfs_mount = p;
+            mr_free(bkpinfo->netfs_mount);
+            bkpinfo->netfs_mount = p;
         }
         /* Initiate bkpinfo isodir path from running environment if mount already done */
         mr_free(bkpinfo->isodir);
-        if (is_this_device_mounted(bkpinfo->nfs_mount)) {
+        if (is_this_device_mounted(bkpinfo->netfs_mount)) {
             mr_asprintf(bkpinfo->isodir, "%s", call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
 
         } else {
-            mr_asprintf(bkpinfo->isodir, "%s/nfsdir", bkpinfo->tmpdir);
+            mr_asprintf(bkpinfo->isodir, "%s/netfsdir", bkpinfo->tmpdir);
             mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
@@ -1731 +1731 @@
 
             if (bkpinfo->restore_data) {
-                mr_asprintf(tmp, "mount -t nfs -o nolock,ro %s %s", bkpinfo->nfs_mount, bkpinfo->isodir);
+                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
+                    mr_asprintf(tmp, "sshfs -o ro %s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+                } else {
+                    mr_asprintf(tmp, "mount -t %s -o nolock,ro %s %s", bkpinfo->netfs_proto, bkpinfo->netfs_mount, bkpinfo->isodir);
+                }
             } else {
-                mr_asprintf(tmp, "mount -t nfs -o nolock %s %s", bkpinfo->nfs_mount, bkpinfo->isodir);
+                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
+                    mr_asprintf(tmp, "sshfs %s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+                } else {
+                    mr_asprintf(tmp, "mount -t %s -o nolock %s %s", bkpinfo->netfs_proto, bkpinfo->netfs_mount, bkpinfo->isodir);
+                }
             }
             run_program_and_log_output(tmp, 3);
@@ -1741 +1749 @@
             strcpy(g_selfmounted_isodir, bkpinfo->isodir);
         }
-        if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
+        if (!is_this_device_mounted(bkpinfo->netfs_mount)) {
             popup_and_OK("Please mount that partition before you try to backup to or restore from it.");
             finish(1);
         }
-        p = popup_and_get_string("Directory", "Which directory within that mountpoint?", bkpinfo->nfs_remote_dir);
+        p = popup_and_get_string("Directory", "Which directory within that mountpoint?", bkpinfo->netfs_remote_dir);
         if (p == NULL) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
-        mr_free(bkpinfo->nfs_remote_dir);
-        bkpinfo->nfs_remote_dir = p;
+        mr_free(bkpinfo->netfs_remote_dir);
+        bkpinfo->netfs_remote_dir = p;
 
         // check whether writable - we better remove surrounding spaces for this
-        mr_strip_spaces(bkpinfo->nfs_remote_dir);
+        mr_strip_spaces(bkpinfo->netfs_remote_dir);
 
         p = popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix);
@@ -1765 +1773 @@
         log_msg(3, "prefix set to %s", bkpinfo->prefix);
 
-        log_msg(3, "Just set nfs_remote_dir to %s", bkpinfo->nfs_remote_dir);
+        log_msg(3, "Just set netfs_remote_dir to %s", bkpinfo->netfs_remote_dir);
         log_msg(3, "isodir is still %s", bkpinfo->isodir);
         break;
@@ -1873 +1881 @@
         bkpinfo->include_paths = p;
 
-        mr_asprintf(tmp, "%s", list_of_NFS_mounts_only());
+        mr_asprintf(tmp, "%s", list_of_NETFS_mounts_only());
         if (strlen(tmp) > 2) {
             mr_strcat(bkpinfo->exclude_paths, " %s",tmp);
@@ -1946 +1954 @@
 
     if (bkpinfo->backup_media_type == iso
-        || bkpinfo->backup_media_type == nfs) {
+        || bkpinfo->backup_media_type == netfs) {
         g_ISO_restore_mode = TRUE;
     }
@@ -1952 +1960 @@
 // skip
 #else
-    if (bkpinfo->backup_media_type == nfs) {
-        log_msg(3, "I think the NFS mount is mounted at %s", bkpinfo->isodir);
+    if (bkpinfo->backup_media_type == netfs) {
+        log_msg(3, "I think the Remote mount is mounted at %s", bkpinfo->isodir);
     }
     log_it("isodir = %s", bkpinfo->isodir);
-    if (bkpinfo->nfs_mount) {
-        log_it("nfs_mount = '%s'", bkpinfo->nfs_mount);
-    }
-    if (bkpinfo->nfs_user) {
-        log_it("nfs_user = '%s'", bkpinfo->nfs_user);
+    if (bkpinfo->netfs_mount) {
+        log_it("netfs_mount = '%s'", bkpinfo->netfs_mount);
+    }
+    if (bkpinfo->netfs_user) {
+        log_it("netfs_user = '%s'", bkpinfo->netfs_user);
+    }
+    if (bkpinfo->netfs_proto) {
+        log_it("netfs_proto = '%s'", bkpinfo->netfs_proto);
     }
 #endif
@@ -2008 +2019 @@
  */
 /**
- * Get a space-separated list of NFS devices and mounts.
+ * Get a space-separated list of NETFS devices and mounts.
  * @return The list created.
  * @note The return value points to static data that will be overwritten with each call.
  */
-char *list_of_NFS_devices_and_mounts(void)
+char *list_of_NETFS_devices_and_mounts(void)
 {
     char *exclude_these_devices = NULL;
@@ -2018 +2029 @@
     static char result_sz[1024];
 
-    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;}'"));
+    mr_asprintf(exclude_these_directories,"%s",list_of_NETFS_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|sshfs|nfs|nfs4|smbfs|cifs|afs|gfs|ocfs|ocfs2|mvfs|nsspool|nsvol) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     snprintf(result_sz, 1023, "%s %s", exclude_these_directories, exclude_these_devices);
     mr_free(exclude_these_devices);
@@ -2030 +2041 @@
 
 /**
- * Get a space-separated list of NFS mounts.
+ * Get a space-separated list of NETFS mounts.
  * @return The list created.
  * @note The return value points to static data that will be overwritten with each call.
  * @bug Even though we only want the mounts, the devices are still checked.
  */
-char *list_of_NFS_mounts_only(void)
+char *list_of_NETFS_mounts_only(void)
 {
     char *exclude_these_directories = NULL;
     static char result_sz[512];
 
-    mr_asprintf(exclude_these_directories,"%s", 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;}'"));
+    mr_asprintf(exclude_these_directories,"%s", call_program_and_get_last_line_of_output("mount -t coda,ncpfs,fuse.sshfs,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, 511, "%s", exclude_these_directories);
     mr_free(exclude_these_directories);
@@ -2094 +2105 @@
     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -t nonfs,msdosfs,ntfs,ntfs-3g,smbfs,smb,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #else
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -x nfs -x nfs4 -x vfat -x ntfs -x ntfs-3g -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660 | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("LANGUAGE=C df -m -P -x nfs -x nfs4 -x fuse.sshfs -x vfat -x ntfs -x ntfs-3g -x smbfs -x smb -x cifs -x afs -x gfs -x ocfs -x ocfs2 -x mvfs -x nsspool -x nssvol -x iso9660 | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'"));
 #endif
 
@@ -2535 +2546 @@
     struct stat buf;
 #endif
-    log_msg(0, "Looking for partition table format type");
     mr_asprintf(fdisk, "/sbin/parted2fdisk");
-    log_msg(1, "Using %s", fdisk);
     mr_asprintf(command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
     mr_free(fdisk);

branches/2.2.10/mondo/src/common/libmondo-devices.h

@@ -38 +38 @@
 int eject_device(char *);
 
-char *list_of_NFS_devices_and_mounts();
-char *list_of_NFS_mounts_only();
+char *list_of_NETFS_devices_and_mounts();
+char *list_of_NETFS_mounts_only();
 
 void sensibly_set_scratchdir();

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

@@ -1299 +1299 @@
     *p = '\0';
     return (sz_res);
-}
-
-
-
-/**
- * Create the filelist for the backup. It will be stored in [scratchdir]/archives/filelist.full.
- * @param logfile Unused.
- * @param include_paths The paths to back up, or NULL if you're using a user-defined filelist.
- * @param excp The paths to NOT back up.
- * @param differential The differential level (currently only 0 and 1 are supported).
- * @param userdef_filelist The user-defined filelist, or NULL if you're using @p include_paths.
- * @return 0, always.
- * @bug @p logfile is unused.
- * @bug Return value is meaningless.
- */
-int mondo_makefilelist(char *logfile, char *include_paths, char *excp, int differential, char *userdef_filelist)
-{
-    char *p, *q;
-    char *sz_datefile;
-    char *sz_filelist;
-    char *exclude_paths = NULL;
-    char *tmp;
-    int i;
-    FILE *fout;
-    char *command = NULL;
-    time_t time_of_last_full_backup = 0;
-    struct stat statbuf;
-    char *tmp1 = NULL;
-    char *tmp2 = NULL;
-
-    malloc_string(tmp);
-    malloc_string(g_skeleton_filelist);
-    mr_asprintf(sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
-    if (!include_paths && !userdef_filelist) {
-        fatal_error("Please supply either include_paths or userdef_filelist");
-    }
-    // make hole for filelist
-    mr_asprintf(command, "mkdir -p %s/archives", bkpinfo->scratchdir);
-    paranoid_system(command);
-    mr_free(command);
-
-    mr_asprintf(sz_filelist, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
-    make_hole_for_file(sz_filelist);
-
-    if (differential == 0) {
-        // restore last good datefile if it exists
-        mr_asprintf(command, "cp -f %s.aborted %s", sz_datefile, sz_datefile);
-        run_program_and_log_output(command, 3);
-        mr_free(command);
-
-        // backup last known good datefile just in case :)
-        if (does_file_exist(sz_datefile)) {
-            mr_asprintf(command, "mv -f %s %s.aborted", sz_datefile, sz_datefile);
-            paranoid_system(command);
-            mr_free(command);
-        }
-        make_hole_for_file(sz_datefile);
-        write_one_liner_data_file(sz_datefile,
-                                  call_program_and_get_last_line_of_output
-                                  ("date +%s"));
-    } else if (lstat(sz_datefile, &statbuf)) {
-        log_msg(2, "Warning - unable to find date of previous backup. Full backup instead.");
-        differential = 0;
-        time_of_last_full_backup = 0;
-    } else {
-        time_of_last_full_backup = statbuf.st_mtime;
-        log_msg(2, "Differential backup. Yay.");
-    }
-    paranoid_free(sz_datefile);
-
-// use user-specified filelist (if specified)
-    if (userdef_filelist) {
-        log_msg(1, "Using the user-specified filelist - %s - instead of calculating one", userdef_filelist);
-        mr_asprintf(command, "cp -f %s %s", userdef_filelist, sz_filelist);
-        if (run_program_and_log_output(command, 3)) {
-            mr_free(command);
-            fatal_error("Failed to copy user-specified filelist");
-        }
-        mr_free(command);
-    } else {
-        if (include_paths) {
-            log_msg(2, "include_paths = '%s'", include_paths);
-        }
-        log_msg(1, "Calculating filelist");
-        mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
-        if (strlen(tmp2) < 1) {
-            mr_asprintf(tmp1," ");
-        } else {
-            log_msg(2, "Found windows FS: %s",tmp2);
-            mr_asprintf(tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
-            mr_free(tmp2);
-            mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
-            log_msg(2, "Found windows files: %s",tmp2);
-        }
-        mr_free(tmp1);
-
-        mr_asprintf(exclude_paths, " %s %s %s %s %s . ..  " MNT_CDROM " " MNT_FLOPPY " /media /tmp  /proc /sys " MINDI_CACHE, MONDO_CACHE, (excp == NULL) ? "" : excp, tmp2, (bkpinfo->tmpdir[0] == '/' && bkpinfo->tmpdir[1] == '/') ? (bkpinfo->tmpdir + 1) : bkpinfo->tmpdir, (bkpinfo->scratchdir[0] == '/' && bkpinfo->scratchdir[1] == '/') ? (bkpinfo->scratchdir + 1) : bkpinfo->scratchdir);
-        mr_free(tmp2);
-
-        log_msg(2, "Excluding paths = '%s'", exclude_paths);
-        log_msg(2, "Generating skeleton filelist so that we can track our progress");
-        sprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", bkpinfo->tmpdir);
-        make_hole_for_file(g_skeleton_filelist);
-        log_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
-        log_msg(2, "Opening out filelist to %s", sz_filelist);
-        if (!(fout = fopen(sz_filelist, "w"))) {
-            fatal_error("Cannot openout to sz_filelist");
-        }
-        i = 0;
-        if ((!include_paths) || (strlen(include_paths) == 0)) {
-            log_msg(1, "Including only '/' in %s", sz_filelist);
-            open_and_list_dir("/", exclude_paths, fout,
-                              time_of_last_full_backup);
-        } else {
-            p = include_paths;
-            while (*p) {
-                q = next_entry(p);
-                log_msg(1, "Including %s in filelist %s", q, sz_filelist);
-                open_and_list_dir(q, exclude_paths, fout,
-                                  time_of_last_full_backup);
-                p += strlen(q);
-                paranoid_free(q);
-                while (*p == ' ') {
-                    p++;
-                }
-            }
-        }
-        mr_free(exclude_paths);
-        paranoid_fclose(fout);
-    }
-    log_msg(2, "Copying new filelist to scratchdir");
-    mr_asprintf(command, "mkdir -p %s/archives", bkpinfo->scratchdir);
-    paranoid_system(command);
-    mr_free(command);
-
-    mr_asprintf(command, "cp -f %s %s/archives/", sz_filelist, bkpinfo->scratchdir);
-    paranoid_system(command);
-    mr_free(command);
-
-    mr_asprintf(command, "mv -f %s %s", sz_filelist, bkpinfo->tmpdir);
-    paranoid_system(command);
-    mr_free(command);
-
-    paranoid_free(sz_filelist);
-    log_msg(2, "Freeing variables");
-    paranoid_free(tmp);
-    paranoid_free(g_skeleton_filelist);
-    log_msg(2, "Exiting");
-    return (0);
-}
-
-
-
-/**
- * Wrapper around mondo_makefilelist().
- * @param bkpinfo The backup information structure. Fields used:
- * - @c bkpinfo->differential
- * - @c bkpinfo->exclude_paths
- * - @c bkpinfo->include_paths
- * - @c bkpinfo->make_filelist
- * - @c bkpinfo->scratchdir
- * - @c bkpinfo->tmpdir
- * @return 0 for success, nonzero for failure.
- * @see mondo_makefilelist
- */
-int prepare_filelist()
-{
-
-    /*@ int **************************************************** */
-    int res = 0;
-
-    assert(bkpinfo != NULL);
-    log_it("tmpdir=%s; scratchdir=%s", bkpinfo->tmpdir, bkpinfo->scratchdir);
-    if (bkpinfo->make_filelist) {
-        mvaddstr_and_log_it(g_currentY, 0,
-                            "Making catalog of files to be backed up");
-    } else {
-        mvaddstr_and_log_it(g_currentY, 0,
-                            "Using supplied catalog of files to be backed up");
-    }
-
-    if (bkpinfo->make_filelist) {
-        res =
-            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->include_paths, bkpinfo->exclude_paths, bkpinfo->differential, NULL);
-    } else {
-        res =
-            mondo_makefilelist(MONDO_LOGFILE, NULL, bkpinfo->exclude_paths, bkpinfo->differential, bkpinfo->include_paths);
-    }
-
-    if (res) {
-        log_OS_error("Call to mondo_makefilelist failed");
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-    }
-    return (res);
 }
 
@@ -1675 +1479 @@
 
 
+
+/**
+ * Create the filelist for the backup. It will be stored in [scratchdir]/archives/filelist.full.
+ * @param logfile Unused.
+ * @param include_paths The paths to back up, or NULL if you're using a user-defined filelist.
+ * @param excp The paths to NOT back up.
+ * @param differential The differential level (currently only 0 and 1 are supported).
+ * @param userdef_filelist The user-defined filelist, or NULL if you're using @p include_paths.
+ * @return 0, always.
+ * @bug @p logfile is unused.
+ * @bug Return value is meaningless.
+ */
+int mondo_makefilelist(char *logfile, char *include_paths, char *excp, int differential, char *userdef_filelist)
+{
+    char *p, *q;
+    char *sz_datefile;
+    char *sz_filelist;
+    char *exclude_paths = NULL;
+    char *tmp;
+    int i;
+    FILE *fout;
+    char *command = NULL;
+    time_t time_of_last_full_backup = 0;
+    struct stat statbuf;
+    char *tmp1 = NULL;
+    char *tmp2 = NULL;
+
+    malloc_string(tmp);
+    malloc_string(g_skeleton_filelist);
+    mr_asprintf(sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
+    if (!include_paths && !userdef_filelist) {
+        fatal_error("Please supply either include_paths or userdef_filelist");
+    }
+    // make hole for filelist
+    mr_asprintf(command, "mkdir -p %s/archives", bkpinfo->scratchdir);
+    paranoid_system(command);
+    mr_free(command);
+
+    mr_asprintf(sz_filelist, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
+    make_hole_for_file(sz_filelist);
+
+    if (differential == 0) {
+        // restore last good datefile if it exists
+        mr_asprintf(command, "cp -f %s.aborted %s", sz_datefile, sz_datefile);
+        run_program_and_log_output(command, 3);
+        mr_free(command);
+
+        // backup last known good datefile just in case :)
+        if (does_file_exist(sz_datefile)) {
+            mr_asprintf(command, "mv -f %s %s.aborted", sz_datefile, sz_datefile);
+            paranoid_system(command);
+            mr_free(command);
+        }
+        make_hole_for_file(sz_datefile);
+        write_one_liner_data_file(sz_datefile,
+                                  call_program_and_get_last_line_of_output
+                                  ("date +%s"));
+    } else if (lstat(sz_datefile, &statbuf)) {
+        log_msg(2, "Warning - unable to find date of previous backup. Full backup instead.");
+        differential = 0;
+        time_of_last_full_backup = 0;
+    } else {
+        time_of_last_full_backup = statbuf.st_mtime;
+        log_msg(2, "Differential backup. Yay.");
+    }
+    paranoid_free(sz_datefile);
+
+// use user-specified filelist (if specified)
+    if (userdef_filelist) {
+        log_msg(1, "Using the user-specified filelist - %s - instead of calculating one", userdef_filelist);
+        mr_asprintf(command, "cp -f %s %s", userdef_filelist, sz_filelist);
+        if (run_program_and_log_output(command, 3)) {
+            mr_free(command);
+            fatal_error("Failed to copy user-specified filelist");
+        }
+        mr_free(command);
+    } else {
+        if (include_paths) {
+            log_msg(2, "include_paths = '%s'", include_paths);
+        }
+        log_msg(1, "Calculating filelist");
+        mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
+        if (strlen(tmp2) < 1) {
+            mr_asprintf(tmp1," ");
+        } else {
+            log_msg(2, "Found windows FS: %s",tmp2);
+            mr_asprintf(tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
+            mr_free(tmp2);
+            mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
+            log_msg(2, "Found windows files: %s",tmp2);
+        }
+        mr_free(tmp1);
+
+        mr_asprintf(exclude_paths, " %s %s %s %s %s . ..  " MNT_CDROM " " MNT_FLOPPY " /media /tmp  /proc /sys " MINDI_CACHE, MONDO_CACHE, (excp == NULL) ? "" : excp, tmp2, (bkpinfo->tmpdir[0] == '/' && bkpinfo->tmpdir[1] == '/') ? (bkpinfo->tmpdir + 1) : bkpinfo->tmpdir, (bkpinfo->scratchdir[0] == '/' && bkpinfo->scratchdir[1] == '/') ? (bkpinfo->scratchdir + 1) : bkpinfo->scratchdir);
+        mr_free(tmp2);
+
+        log_msg(2, "Excluding paths = '%s'", exclude_paths);
+        log_msg(2, "Generating skeleton filelist so that we can track our progress");
+        sprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", bkpinfo->tmpdir);
+        make_hole_for_file(g_skeleton_filelist);
+        log_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
+        log_msg(2, "Opening out filelist to %s", sz_filelist);
+        if (!(fout = fopen(sz_filelist, "w"))) {
+            fatal_error("Cannot openout to sz_filelist");
+        }
+        i = 0;
+        if ((!include_paths) || (strlen(include_paths) == 0)) {
+            log_msg(1, "Including only '/' in %s", sz_filelist);
+            open_and_list_dir("/", exclude_paths, fout,
+                              time_of_last_full_backup);
+        } else {
+            p = include_paths;
+            while (*p) {
+                q = next_entry(p);
+                log_msg(1, "Including %s in filelist %s", q, sz_filelist);
+                open_and_list_dir(q, exclude_paths, fout,
+                                  time_of_last_full_backup);
+                p += strlen(q);
+                paranoid_free(q);
+                while (*p == ' ') {
+                    p++;
+                }
+            }
+        }
+        mr_free(exclude_paths);
+        paranoid_fclose(fout);
+    }
+    log_msg(2, "Copying new filelist to scratchdir");
+    mr_asprintf(command, "mkdir -p %s/archives", bkpinfo->scratchdir);
+    paranoid_system(command);
+    mr_free(command);
+
+    mr_asprintf(command, "cp -f %s %s/archives/", sz_filelist, bkpinfo->scratchdir);
+    paranoid_system(command);
+    mr_free(command);
+
+    mr_asprintf(command, "mv -f %s %s", sz_filelist, bkpinfo->tmpdir);
+    paranoid_system(command);
+    mr_free(command);
+
+    paranoid_free(sz_filelist);
+    log_msg(2, "Freeing variables");
+    paranoid_free(tmp);
+    paranoid_free(g_skeleton_filelist);
+    log_msg(2, "Exiting");
+    return (0);
+}
+
+
+
+/**
+ * Wrapper around mondo_makefilelist().
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->differential
+ * - @c bkpinfo->exclude_paths
+ * - @c bkpinfo->include_paths
+ * - @c bkpinfo->make_filelist
+ * - @c bkpinfo->scratchdir
+ * - @c bkpinfo->tmpdir
+ * @return 0 for success, nonzero for failure.
+ * @see mondo_makefilelist
+ */
+int prepare_filelist()
+{
+
+    /*@ int **************************************************** */
+    int res = 0;
+
+    assert(bkpinfo != NULL);
+    log_it("tmpdir=%s; scratchdir=%s", bkpinfo->tmpdir, bkpinfo->scratchdir);
+    if (bkpinfo->make_filelist) {
+        mvaddstr_and_log_it(g_currentY, 0,
+                            "Making catalog of files to be backed up");
+    } else {
+        mvaddstr_and_log_it(g_currentY, 0,
+                            "Using supplied catalog of files to be backed up");
+    }
+
+    if (bkpinfo->make_filelist) {
+        res =
+            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->include_paths, bkpinfo->exclude_paths, bkpinfo->differential, NULL);
+    } else {
+        res =
+            mondo_makefilelist(MONDO_LOGFILE, NULL, bkpinfo->exclude_paths, bkpinfo->differential, bkpinfo->include_paths);
+    }
+
+    if (res) {
+        log_OS_error("Call to mondo_makefilelist failed");
+        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    }
+    return (res);
+}
+
+
 /**
  * Locate the string @p string_to_find in the tree rooted at @p startnode.

branches/2.2.10/mondo/src/common/libmondo-files-EXT.h

@@ -33 +33 @@
 extern long size_of_all_biggiefiles_K();
 extern void copy_mondo_and_mindi_stuff_to_scratchdir();
-extern void store_nfs_config();
+extern void store_netfs_config();
 
 

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

@@ -1059 +1059 @@
 
 /**
- * Store the client's NFS configuration in files to be restored at restore-time.
- * Assumes that @c bkpinfo->media_type = nfs, but does not check for this.
+ * Store the client's NETFS configuration in files to be restored at restore-time.
+ * Assumes that @c bkpinfo->media_type = netfs, but does not check for this.
  * @param bkpinfo The backup information structure. Fields used:
- * - @c nfs_mount
- * - @c nfs_remote_dir
+ * - @c netfs_mount
+ * - @c netfs_remote_dir
  * - @c tmpdir
  */
-void store_nfs_config()
+void store_netfs_config()
 {
 
     /*@ buffers ******** */
-    char *nfs_dev = NULL;
+    char *netfs_dev = NULL;
     char *mac_addr = NULL;
-    char *nfs_mount = NULL;
-    char *nfs_client_ipaddr = NULL;
-    char *nfs_client_netmask = NULL;
-    char *nfs_client_broadcast = NULL;
-    char *nfs_client_defgw = NULL;
-    char *nfs_server_ipaddr = NULL;
+    char *netfs_mount = NULL;
+    char *netfs_client_ipaddr = NULL;
+    char *netfs_client_netmask = NULL;
+    char *netfs_client_broadcast = NULL;
+    char *netfs_client_defgw = NULL;
+    char *netfs_server_ipaddr = NULL;
     char *tmp = NULL;
     char *command = NULL;
@@ -1084 +1084 @@
     char *p;
 
-    if (! bkpinfo->nfs_mount) {
-        fatal_error("No nfs_mount found !");
-    }
-
-    log_it("Storing NFS configuration");
-    mr_asprintf(tmp, "%s", bkpinfo->nfs_mount);
+    if (! bkpinfo->netfs_mount) {
+        fatal_error("No netfs_mount found !");
+    }
+
+    log_it("Storing Network configuration");
+    mr_asprintf(tmp, "%s", bkpinfo->netfs_mount);
     p = strchr(tmp, ':');
     if (!p) {
-        fatal_error("NFS mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
+        fatal_error("Network mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
     }
     *(p++) = '\0';
-    mr_asprintf(nfs_server_ipaddr, "%s", tmp);
-    mr_asprintf(nfs_mount, "%s", p);
+    mr_asprintf(netfs_server_ipaddr, "%s", tmp);
+    mr_asprintf(netfs_mount, "%s", p);
     mr_free(tmp);
 
     /* BERLIOS : there is a bug #67 here as it only considers the first NIC */
     mr_asprintf(command, "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
-    mr_asprintf(nfs_dev, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(netfs_dev, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
     mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
-    mr_asprintf(nfs_client_ipaddr, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(netfs_client_ipaddr, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
     mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f9 | cut -d':' -f2");
-    mr_asprintf(nfs_client_netmask, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(netfs_client_netmask, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
     mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2");
-    mr_asprintf(nfs_client_broadcast, "%s", call_program_and_get_last_line_of_output(command));
+    mr_asprintf(netfs_client_broadcast, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);
 
     mr_asprintf(command, "%s", "route -n | grep '^0.0.0.0' | awk '{print $2}'");
-    mr_asprintf(nfs_client_defgw, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
-
-    if (strlen(nfs_dev) < 2) {
-        fatal_error
-            ("Unable to find ethN (eth0, eth1, ...) adapter via NFS mount you specified.");
-    }
+    mr_asprintf(netfs_client_defgw, "%s", call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
+    if (strlen(netfs_dev) < 2) {
+        fatal_error("Unable to find ethN (eth0, eth1, ...) adapter via Network mount you specified.");
+    }
+
     /********
-    * If the NFS device that found above is a bonded device, 
+    * If the Network device that found above is a bonded device, 
     * we need to replace it with an ethN device or the
-    * networking will not start during an NFS restore.
+    * networking will not start during an Network restore.
     *
-    * If the NFS device in nfs_dev begins with the word "bond", or alb or aft
-    * look for the corresponding slave ethN device and copy it to nfs_dev.
+    * If the Network device in netfs_dev begins with the word "bond", or alb or aft
+    * look for the corresponding slave ethN device and copy it to netfs_dev.
     * Using the common MAC address
     ********/
-    if (!strncmp(nfs_dev, "bond", 4) || !strncmp(nfs_dev, "alb", 3) || !strncmp(nfs_dev, "aft", 3)) {
-        log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
-        mr_asprintf(command, "%s", "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
+    if (!strncmp(netfs_dev, "bond", 4) || !strncmp(netfs_dev, "alb", 3) || !strncmp(netfs_dev, "aft", 3)) {
+        log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", netfs_dev);
+        mr_asprintf(command, "%s", "ifconfig %s | awk '{print $5}' | head -n1", netfs_dev);
         mr_asprintf(mac_addr, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
 
-        mr_asprintf(command, "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,nfs_dev);
+        mr_asprintf(command, "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1", mac_addr,netfs_dev);
         mr_free(mac_addr);
-        mr_free(nfs_dev);
-
-        mr_asprintf(nfs_dev, "%s", call_program_and_get_last_line_of_output(command));
+        mr_free(netfs_dev);
+
+        mr_asprintf(netfs_dev, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
 
-        log_to_screen("Replacing it with %s\n", nfs_dev);
-    }
-
-    mr_asprintf(tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_dev);
-    mr_free(nfs_dev);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_ipaddr);
-    mr_free(nfs_client_ipaddr);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_netmask);
-    mr_free(nfs_client_netmask);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_broadcast);
-    mr_free(nfs_client_broadcast);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_client_defgw);
-    mr_free(nfs_client_defgw);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, nfs_server_ipaddr);
-    mr_free(tmp);
-    mr_free(nfs_server_ipaddr);
-
-    mr_asprintf(tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->nfs_mount);
-    mr_free(tmp);
-    mr_free(nfs_mount);
-
-    mr_asprintf(tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->nfs_remote_dir);
+        log_to_screen("Replacing it with %s\n", netfs_dev);
+    }
+
+    mr_asprintf(tmp, "%s/NETFS-DEV", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_dev);
+    mr_free(netfs_dev);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-PROTO", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_proto);
+
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-IPADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_ipaddr);
+    mr_free(netfs_client_ipaddr);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-NETMASK", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_netmask);
+    mr_free(netfs_client_netmask);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_broadcast);
+    mr_free(netfs_client_broadcast);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-DEFGW", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_defgw);
+    mr_free(netfs_client_defgw);
+    mr_free(tmp);
+
+    mr_asprintf(tmp, "%s/NETFS-SERVER-IPADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_server_ipaddr);
+    mr_free(tmp);
+    mr_free(netfs_server_ipaddr);
+
+    mr_asprintf(tmp, "%s/NETFS-SERVER-MOUNT", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_mount);
+    mr_free(tmp);
+    mr_free(netfs_mount);
+
+    mr_asprintf(tmp, "%s/NETFS-SERVER-PATH", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_remote_dir);
     mr_free(tmp);
 
@@ -1192 +1195 @@
     mr_free(tmp);
 
-    log_it("Finished storing NFS configuration");
+    log_it("Finished storing Network configuration");
 }
 

branches/2.2.10/mondo/src/common/libmondo-files.h

@@ -33 +33 @@
 
 void copy_mondo_and_mindi_stuff_to_scratchdir();
-void store_nfs_config();
+void store_netfs_config();
 void estimate_noof_media_required(long);
 bool is_this_file_compressed(char *);

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

@@ -117 +117 @@
     old_stderr[0] = '\0';
 
-    if (bkpinfo->nfs_user) {
-        mr_asprintf(tmp1, "su - %s -c \"%s\"", bkpinfo->nfs_user, basic_call);
+    if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
+        mr_asprintf(tmp1, "su - %s -c \"%s\"", bkpinfo->netfs_user, basic_call);
     } else {
         mr_asprintf(tmp1, "%s", basic_call);

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

@@ -406 +406 @@
             continue;
         }
+        log_msg(2, "Processing partition %s on %s #%d in mountlist", device, drive, pos);
         /* gap in the partition list? */
         if (curr_part_no - prev_part_no > 1) {
@@ -502 +503 @@
     if (res == 0) {
         mr_free(flaws_str);
+        log_msg(2, "Fine, no error in evaluate_drive_within_mountlist");
         return (NULL);
     } else {
+        log_msg(2, "Error in evaluate_drive_within_mountlist: %s", flaws_str);
         return (flaws_str);
     }

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

@@ -1102 +1102 @@
         mr_asprintf(type_of_backup, "ISO");
         break;
-    case nfs:
-        mr_asprintf(type_of_backup, "nfs");
+    case netfs:
+        mr_asprintf(type_of_backup, "netfs");
         break;
     case usb:

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

@@ -373 +373 @@
  * - Used: @c bkpinfo->make_cd_use_lilo
  * - Used: @c bkpinfo->media_device
- * - Used: @c bkpinfo->nfs_mount
+ * - Used: @c bkpinfo->netfs_mount
  * - Used: @c bkpinfo->nonbootable_backup
  * - Used: @c bkpinfo->scratchdir
@@ -657 +657 @@
     }                           // end of iso code
 
-    if (bkpinfo->backup_media_type == nfs) {
-        if (bkpinfo->nfs_mount) {
-            mr_asprintf(hostname, "%s", bkpinfo->nfs_mount);
+    if (bkpinfo->backup_media_type == netfs) {
+        if (bkpinfo->netfs_mount) {
+            mr_asprintf(hostname, "%s", bkpinfo->netfs_mount);
         } else {
-            log_it("nfs_mount is NULL");
+            log_it("netfs_mount is NULL");
             retval++;
             mr_asprintf(hostname, "");
@@ -667 +667 @@
         colon = strchr(hostname, ':');
         if (!colon) {
-            log_it("nfs mount doesn't have a colon in it");
+            log_it("netfs mount doesn't have a colon in it");
             retval++;
         } else {
@@ -675 +675 @@
             hent = gethostbyname(hostname);
             if (!hent) {
-                log_it("Can't resolve NFS mount (%s): %s", hostname, hstrerror(h_errno));
+                log_it("Can't resolve Network mount (%s): %s", hostname, hstrerror(h_errno));
                 retval++;
             } else {
                 mr_asprintf(ip_address, "%s", inet_ntoa((struct in_addr) *((struct in_addr *) hent->h_addr)));
-                mr_strcat(ip_address, strchr(bkpinfo->nfs_mount, ':'));
-                mr_free(bkpinfo->nfs_mount);
-                bkpinfo->nfs_mount = ip_address;
+                mr_strcat(ip_address, strchr(bkpinfo->netfs_mount, ':'));
+                mr_free(bkpinfo->netfs_mount);
+                bkpinfo->netfs_mount = ip_address;
             }
         }
         mr_free(hostname);
-        store_nfs_config();
+        store_netfs_config();
     }
 
@@ -797 +797 @@
     mr_free(bkpinfo->call_after_iso);
     mr_free(bkpinfo->kernel_path);
-    mr_free(bkpinfo->nfs_mount);
-    mr_free(bkpinfo->nfs_remote_dir);
-    mr_free(bkpinfo->nfs_user);
+    mr_free(bkpinfo->netfs_mount);
+    mr_free(bkpinfo->netfs_remote_dir);
+    mr_free(bkpinfo->netfs_user);
+    mr_free(bkpinfo->netfs_proto);
     mr_free(bkpinfo->postnuke_tarball);
 
@@ -855 +856 @@
     bkpinfo->call_after_iso = NULL;
     bkpinfo->kernel_path = NULL;
-    bkpinfo->nfs_mount = NULL;
-    bkpinfo->nfs_remote_dir = NULL;
-    bkpinfo->nfs_user = NULL;
+    bkpinfo->netfs_mount = NULL;
+    bkpinfo->netfs_remote_dir = NULL;
+    bkpinfo->netfs_user = NULL;
+    bkpinfo->netfs_proto = NULL;
     bkpinfo->postnuke_tarball = NULL;
     bkpinfo->wipe_media_first = FALSE;

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

@@ -1014 +1014 @@
  * - @c bkpinfo->manual_cd_tray
  * - @c bkpinfo->media_device
- * - @c bkpinfo->nfs_remote_dir
+ * - @c bkpinfo->netfs_remote_dir
  * - @c bkpinfo->tmpdir
  * - @c bkpinfo->verify_data
@@ -1048 +1048 @@
 
     mr_asprintf(mountpoint, "%s/cdrom", bkpinfo->tmpdir);
-    if (((bkpinfo->isodir == NULL) && (bkpinfo->nfs_remote_dir == NULL)) || (bkpinfo->prefix == NULL)) {
+    if (((bkpinfo->isodir == NULL) && (bkpinfo->netfs_remote_dir == NULL)) || (bkpinfo->prefix == NULL)) {
         fatal_error("No iso filename preparation possible");
     }
-    if (bkpinfo->nfs_remote_dir) {
-        // NFS
-        mr_asprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+    if (bkpinfo->netfs_remote_dir) {
+        // NETFS
+        mr_asprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
     } else {
         // ISO

branches/2.2.10/mondo/src/common/mondostructures.h

@@ -182 +182 @@
     dvd,                        ///< Back up to DVD+R[W] or DVD-R[W] disks.
     cdstream,                   ///< Back up to recordable CDs but treat them like a tape streamer.
-    nfs,                        ///< Back up to an NFS mount on the local subnet.
+    netfs,                      ///< Back up to an NETFS mount on the local subnet.
     tape,                       ///< Back up to tapes.
     usb,                        ///< Back up to USB devices.
@@ -557 +557 @@
 
   /**
-   * The NFS mount to back up to/restore from.
-   * If backup_media_type is not @b nfs, this is ignored.
+   * The NETFS mount to back up to/restore from.
+   * If backup_media_type is not @b netfs, this is ignored.
    * It must contain a colon, and the server's address should be in dotted-decimal IP
    * address form. (Domain names will be resolved in post_param_configuration().)
    */
-    char *nfs_mount;
-
-  /**
-   * The directory, relative to the root of @p nfs_mount, to put
+    char *netfs_mount;
+
+  /**
+   * The directory, relative to the root of @p netfs_mount, to put
    * the backups in.
    */
-    char *nfs_remote_dir;
-
-  /**
-   * The potential user to use for NFS backup
-   */
-    char *nfs_user;
+    char *netfs_remote_dir;
+
+  /**
+   * The potential user to use for NETFS backup
+   */
+    char *netfs_user;
+
+  /**
+   * The protocol to use for Network backup (NFS, SSHFS, ...)
+   */
+    char *netfs_proto;
 
   /**

branches/2.2.10/mondo/src/common/newt-specific.c

@@ -20 +20 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 #include "mondostructures.h"
 #include "newt-specific.h"
@@ -99 +100 @@
     long g_start_time = 0L;     ///< The time (in seconds since the epoch) that the progress form was opened.
     bool g_text_mode = TRUE;    ///< If FALSE, use a newt interface; if TRUE, use an ugly (but more compatible) dumb terminal interface.
-    char *g_selfmounted_isodir; ///< Holds the NFS mountpoint if mounted via mondoarchive.
+    char *g_selfmounted_isodir; ///< Holds the NETFS mountpoint if mounted via mondoarchive.
 
 /* @} - end of globalGroup */
@@ -1106 +1107 @@
  * Ask the user which backup media type they would like to use.
  * The choices are @p none (exit to shell), @c cdr, @c cdrw, @c dvd,
- * @c tape, @c cdstream, @c udev (only when @p g_text_mode is TRUE), @c nfs,
+ * @c tape, @c cdstream, @c udev (only when @p g_text_mode is TRUE), @c netfs,
  * and @c iso.
  * @param restoring TRUE if we're restoring, FALSE if we're backing up.
@@ -1120 +1121 @@
         char *title_sz = NULL;
         char *minimsg_sz = NULL;
-        static t_bkptype possible_bkptypes[] = { none, cdr, cdrw, dvd, tape, cdstream, udev, nfs, iso };
-        static char *possible_responses[] = { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev", "nfs", "iso", NULL };
+        static t_bkptype possible_bkptypes[] = { none, cdr, cdrw, dvd, tape, cdstream, udev, netfs, iso };
+        static char *possible_responses[] = { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev", "netfs", "iso", NULL };
         char *outstr = NULL;
         t_bkptype backup_type;
@@ -1171 +1172 @@
         b4 = newtButton(17, 5, "USB Key/Disk");
         b5 = newtButton(1, 5, " DVD disks ");
-        b6 = newtButton(17, 9, " NFS mount ");
+        b6 = newtButton(17, 9, " Net mount ");
         b7 = newtButton(1, 13, " Hard disk ");
         b8 = newtButton(17, 13, "    Exit   ");
@@ -1191 +1192 @@
             output = dvd;
         } else if (b_res == b6) {
-            output = nfs;
+            output = netfs;
         } else if (b_res == b7) {
             output = iso;
@@ -1453 +1454 @@
         for (i = 0; i < filelist->entries; i++) {
             keylist[i] = (void *) i;
-            tmp = filelist_entry_to_string(&(filelist->el[i])), keylist[i];
-            newtListboxAppendEntry(fileListbox, tmp);
+            tmp = filelist_entry_to_string(&(filelist->el[i]));
+            newtListboxAppendEntry(fileListbox, tmp, keylist[i]);
             mr_free(tmp);
         }

branches/2.2.10/mondo/src/include/my-stuff.h

@@ -319 +319 @@
 #define DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE  "/dev/md"
 #define RAID_DEVICE_STUB    DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE
-#define SANE_FORMATS        "swap image vfat ext2 ext3 ext4 xfs vfs jfs reiserfs vmfs dos minix coda nfs nfs4 ntfs ntfs-3g hpfs raid lvm cifs ocfs ocfs2"
+#define SANE_FORMATS        "swap image vfat ext2 ext3 ext4 xfs vfs jfs reiserfs vmfs dos minix coda fuse.sshfs nfs nfs4 ntfs ntfs-3g hpfs raid lvm cifs ocfs ocfs2"
 #define ALT_TAPE        "/dev/ht0"
 #define MKE2FS_OR_NEWFS "mke2fs"

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -2289 +2289 @@
     }
 
-    if (does_file_exist("/tmp/NFS-SERVER-PATH")) {
+    if (does_file_exist("/tmp/NETFS-SERVER-PATH")) {
         mr_free(idev);
-        idev = last_line_of_file("/tmp/NFS-SERVER-MOUNT");
-        mr_asprintf(isodir_format, "nfs");
+        idev = last_line_of_file("/tmp/NETFS-SERVER-MOUNT");
+        mr_asprintf(isodir_format, "netfs");
         mr_free(isodir_path);
-        isodir_path = last_line_of_file("/tmp/NFS-SERVER-PATH");
+        isodir_path = last_line_of_file("/tmp/NETFS-SERVER-PATH");
     }
 

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -7 +7 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -562 +563 @@
     }
 
-    if (bkpinfo->backup_media_type == nfs) {
-        log_msg(2, "Mounting for NFS thingy");
+    if (bkpinfo->backup_media_type == netfs) {
+        log_msg(2, "Mounting for Network thingy");
         log_msg(2, "isodir = %s", bkpinfo->isodir);
         if (!strcmp(bkpinfo->isodir, "/") && am_I_in_disaster_recovery_mode()) {
@@ -570 +571 @@
             log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
-        if ((bkpinfo->isodir == NULL) || (bkpinfo->nfs_remote_dir == NULL) || (bkpinfo->prefix == NULL)) {
+        if ((bkpinfo->isodir == NULL) || (bkpinfo->netfs_remote_dir == NULL) || (bkpinfo->prefix == NULL)) {
             fatal_error("Unable to prepare the iso filename");
         }
 #ifdef __FreeBSD__
-        mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+        mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
         mr_free(mount_cmd);
@@ -580 +581 @@
         mr_asprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
 #else
-        mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
 
@@ -744 +745 @@
             mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
         }
-    } else if (!strcmp(value, "nfs")) {
-        bkpinfo->backup_media_type = nfs;
+    } else if (!strcmp(value, "netfs")) {
+        bkpinfo->backup_media_type = netfs;
         bkpinfo->please_dont_eject = TRUE;
         mr_free(bkpinfo->prefix);
@@ -757 +758 @@
         if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "pxe")) {
             /* We need to override prefix value in PXE mode as it's 
-            * already done in start-nfs */
+            * already done in start-netfs */
             envtmp1 = getenv("imgname");
             if (envtmp1 == NULL) {
@@ -944 +945 @@
 mr_free(tmp);
 
-if (bkpinfo->backup_media_type == nfs) {
+if (bkpinfo->backup_media_type == netfs) {
     if (!cfgf) {
-        if (bkpinfo->nfs_mount) {
-            log_msg(2, "nfs_mount remains %s", bkpinfo->nfs_mount);
-        }
-        if (bkpinfo->nfs_remote_dir) {
-            log_msg(2, "nfs_remote_dir remains %s", bkpinfo->nfs_remote_dir);
+        if (bkpinfo->netfs_mount) {
+            log_msg(2, "netfs_mount remains %s", bkpinfo->netfs_mount);
+        }
+        if (bkpinfo->netfs_remote_dir) {
+            log_msg(2, "netfs_remote_dir remains %s", bkpinfo->netfs_remote_dir);
         }
         log_msg(2, "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
     } else {
-        mr_free(bkpinfo->nfs_mount);
-        bkpinfo->nfs_mount = read_cfg_var(g_mondo_cfg_file, "nfs-server-mount");
-
-        mr_free(bkpinfo->nfs_remote_dir);
-        bkpinfo->nfs_remote_dir = read_cfg_var(g_mondo_cfg_file, "nfs-server-path");
-
-        if (bkpinfo->nfs_mount != NULL) {
-            log_msg(2, "nfs_mount is %s", bkpinfo->nfs_mount);
-        }
-        if (bkpinfo->nfs_remote_dir != NULL) {
-            log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
+        mr_free(bkpinfo->netfs_mount);
+        bkpinfo->netfs_mount = read_cfg_var(g_mondo_cfg_file, "netfs-server-mount");
+
+        mr_free(bkpinfo->netfs_remote_dir);
+        bkpinfo->netfs_remote_dir = read_cfg_var(g_mondo_cfg_file, "netfs-server-path");
+
+        if (bkpinfo->netfs_mount != NULL) {
+            log_msg(2, "netfs_mount is %s", bkpinfo->netfs_mount);
+        }
+        if (bkpinfo->netfs_remote_dir != NULL) {
+            log_msg(2, "netfs_remote_dir is %s", bkpinfo->netfs_remote_dir);
+        }
+        if (bkpinfo->netfs_proto != NULL) {
+            log_msg(2, "netfs_proto is %s", bkpinfo->netfs_proto);
         }
     }
     if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "pxe")) {
         /* We need to override values in PXE mode as it's
-        * already done in start-nfs */
-        envtmp1 = getenv("nfsmount");
+        * already done in start-netfs */
+        envtmp1 = getenv("netfsmount");
         if (envtmp1 == NULL) {
-            fatal_error("no nfsmount variable in environment");
+            fatal_error("no netfsmount variable in environment");
         }
         envtmp2 = getenv("dirimg");
@@ -978 +982 @@
             fatal_error("no dirimg variable in environment");
         }
-        mr_free(bkpinfo->nfs_mount);
-        mr_asprintf(bkpinfo->nfs_mount, "%s", envtmp1);
-
-        mr_free(bkpinfo->nfs_remote_dir);
-        mr_asprintf(bkpinfo->nfs_remote_dir, "%s", envtmp2);
+        mr_free(bkpinfo->netfs_mount);
+        mr_asprintf(bkpinfo->netfs_mount, "%s", envtmp1);
+
+        mr_free(bkpinfo->netfs_remote_dir);
+        mr_asprintf(bkpinfo->netfs_remote_dir, "%s", envtmp2);
     }
 } else if (bkpinfo->backup_media_type == iso) {

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -919 +919 @@
     mr_free(bkpinfo->restore_path);
     mr_asprintf(bkpinfo->restore_path, "/");
-    if (!g_restoring_live_from_cd && !g_restoring_live_from_nfs) {
+    if (!g_restoring_live_from_cd && !g_restoring_live_from_netfs) {
         popup_and_OK
             ("Please insert tape/CD/USB Key, then hit 'OK' to continue.");
         sleep(1);
     }
-    if (!g_restoring_live_from_nfs) {
+    if (!g_restoring_live_from_netfs) {
         interactively_obtain_media_parameters_from_user(FALSE);
     }
@@ -946 +946 @@
     load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
 
-    if (!g_restoring_live_from_nfs && (filelist = process_filelist_and_biggielist())) {
+    if (!g_restoring_live_from_netfs && (filelist = process_filelist_and_biggielist())) {
         save_filelist(filelist, "/tmp/selected-files.txt");
         mr_asprintf(old_restpath, "%s", bkpinfo->restore_path);
@@ -2828 +2828 @@
         mount_boot_if_necessary();  /* for Gentoo users */
         log_msg(2, "Still here.");
-        if (bkpinfo->backup_media_type == nfs) {
-            g_restoring_live_from_nfs = TRUE;
+        if (bkpinfo->backup_media_type == netfs) {
+            g_restoring_live_from_netfs = TRUE;
         }
         /* Adding an initialisation in order to avoid to hndle NULL pointer later */
@@ -2861 +2861 @@
         // BCO:To be reviewed
         if ((bkpinfo->restore_mode == compare) || (bkpinfo->restore_mode == nuke)) {
-            if (bkpinfo->backup_media_type == nfs && bkpinfo->nfs_mount && !is_this_device_mounted(bkpinfo->nfs_mount)) {
-                log_msg(1, "Mounting nfs dir");
+            if (bkpinfo->backup_media_type == netfs && bkpinfo->netfs_mount && !is_this_device_mounted(bkpinfo->netfs_mount)) {
+                log_msg(1, "Mounting remote %s dir", bkpinfo->netfs_proto);
                 mr_free(bkpinfo->isodir);
                 mr_asprintf(bkpinfo->isodir, "/tmp/isodir");
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
-                mr_asprintf(tmp, "mount %s -t nfs -o nolock,ro /tmp/isodir", bkpinfo->nfs_mount);
+                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
+                    mr_asprintf(tmp, "sshfs -o ro %s /tmp/isodir", bkpinfo->netfs_mount);
+                } else {
+                    mr_asprintf(tmp, "mount %s -o nolock,ro /tmp/isodir", bkpinfo->netfs_mount);
+                }
                 run_program_and_log_output(tmp, 1);
                 mr_free(tmp);

branches/2.2.10/mondo/src/mondorestore/mr-externs.h

@@ -107 +107 @@
 extern bool g_text_mode;
 extern bool g_restoring_live_from_cd;
-extern bool g_restoring_live_from_nfs;
+extern bool g_restoring_live_from_netfs;
 extern int fput_string_one_char_at_a_time(FILE *, char *);
 extern char *evaluate_mountlist(struct mountlist_itself *mountlist, int *res);