Changeset 2428 in MondoRescue

Timestamp:

Sep 28, 2009, 2:29:12 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Attempt to stay backward compatible without protocol for -n option
• Improving ssh support at restore time by providing a shadow file
• analyze-my-lvm now removes excluded devices from list coming from mondoarchive
• new mr_make_devlist_from_pathlist which handle the new bkpinfo->exclude_devs field containing the excluded devices and remove corresponding code from libmondo-cli.c
• Move DSF code into libmondo-devices.c for coherency, and only the previous function is made externally available
• Remove dev_to_exclude in libmondo-archive.c which wasn't working correctly and replace it with bkpinfo->exclude_devs
• Fix an issue in is_this_device_mounted (string freed before last usage)
• Adds support for bnx2x (BL 460 G6) and auth_rpcgss (Debian 2.6.31)

(Backport from 2.2.9)

Location:

branches/2.2.10

Files:

• mindi/analyze-my-lvm (modified) (1 diff)
• mindi/mindi (modified) (3 diffs)
• mindi/rootfs/etc/passwd (modified) (1 diff)
• mindi/rootfs/etc/shadow (copied) (copied from branches/2.2.9/mindi/rootfs/etc/shadow )
• mondo/src/common/libmondo-archive.c (modified) (4 diffs)
• mondo/src/common/libmondo-cli.c (modified) (6 diffs)
• mondo/src/common/libmondo-devices.c (modified) (7 diffs)
• mondo/src/common/libmondo-tools.c (modified) (2 diffs)
• mondo/src/common/mondostructures.h (modified) (1 diff)

branches/2.2.10/mindi/analyze-my-lvm

@@ -177 +177 @@
 
 ListLvmDrivesAndPartitions() {
-    $LVMCMD vgdisplay -v 2> /dev/null | grep "PV Name" | sed 's/(#)//' | awk '{print $3}' > $MINDI_TMP/vg.tmp
-    if [ -f /etc/multipath.conf ]; then
-        # If multipath check which type of devidec are given, mpath prefered
-        for d in `cat  $MINDI_TMP/vg.tmp`; do
+    for d in `$LVMCMD vgdisplay -v 2> /dev/null | grep "PV Name" | sed 's/(#)//' | awk '{print $3}'`; do 
+        # Skip devices excluded, coming from mondoarchive
+        if [ "$EXCLUDE_DEVS" ] && [ "`echo " $EXCLUDE_DEVS " | grep " $d "`" ]; then
+            continue
+        fi
+        # If multipath check which type of devides are given, mpath prefered
+        if [ -f /etc/multipath.conf ]; then
             GiveMapperOfdm $d
-        done
-    else
-        cat $MINDI_TMP/vg.tmp
-    fi
-    rm -f $MINDI_TMP/vg.tmp
+        else
+            echo $d
+        fi
+    done
 }
 

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 fuse"
+NET_MODS="auth_rpcgss sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 bnx2 bnx2x 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.
@@ -979 +979 @@
             LVM="false"
         fi
-        all_partitions=`cat $MINDI_TMP/lvm.res | grep -F ">>>" | cut -d' ' -f2-32`
+        all_partitions=`cat $MINDI_TMP/lvm.res | grep -F ">>>" | cut -d' ' -f2-`
     fi
     all_partitions="$all_partitions `ListAllPartitions 2> /dev/null`"
@@ -2744 +2744 @@
         LAST_FILELIST_NUMBER=${12}
         ESTIMATED_TOTAL_NOOF_SLICES=${13}
-        EXCLUDE_DEVS="${14}"
+        export EXCLUDE_DEVS="${14}"
         USE_COMP="${15}"
         USE_LILO="${16}"

branches/2.2.10/mindi/rootfs/etc/passwd

@@ -16 +16 @@
 guest:x:405:100:guest:/dev/null:/dev/null
 nobody:x:65534:100:nobody:/dev/null:
-alfa::1001:0:alfa:/alfa:

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

@@ -517 +517 @@
     char *cd_recovery_sz = NULL;
     char *tape_size_sz = NULL;
-    char *devs_to_exclude = NULL;
     char *use_lilo_sz = NULL;   /* BCO: shared between LILO/ELILO */
     char *value = NULL;
@@ -536 +535 @@
 
     assert(bkpinfo != NULL);
-    if (bkpinfo->exclude_paths) {
-        mr_asprintf(tmp, "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'", bkpinfo->exclude_paths);
-        devs_to_exclude = call_program_and_get_last_line_of_output(tmp);
-        mr_free(tmp);
-
-        log_msg(2, "devs_to_exclude = '%s'", devs_to_exclude);
-    }
 
     mr_asprintf(tmp, "%s/filelist.full", bkpinfo->tmpdir);
@@ -815 +807 @@
             last_filelist_number,   // parameter #12 (STRING)
             estimated_total_noof_slices,    // parameter #13 (INT)
-            (devs_to_exclude == NULL) ? "\"\"" : devs_to_exclude,   // parameter #14
+            (bkpinfo->exclude_devs == NULL) ? "\"\"" : bkpinfo->exclude_devs,   // parameter #14
             use_comp_sz,        // parameter #15
             use_lilo_sz,        // parameter #16
@@ -826 +818 @@
 
     mr_free(tmp2);
-    mr_free(devs_to_exclude);
     mr_free(last_filelist_number);
     mr_free(tape_device);

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

@@ -38 +38 @@
 
 extern void setup_tmpdir(char *path);
+void mr_make_devlist_from_pathlist(char *pathlist, char mode);
 extern double g_kernel_version;
 extern int g_current_media_number;
 extern pid_t g_main_pid;
 extern char *resolve_softlinks_to_get_to_actual_device_file(char *);
-
-/* Stuff that handles the -I and -E option when a whole disk DSF is used */
-typedef struct mounted_fs_struct {
-    char device[MAX_STR_LEN];       /* The name of the device */
-    char mount_point[MAX_STR_LEN];  /* The devices mount point */
-    unsigned char check;            /* 1 == included on DSF */
-    struct mounted_fs_struct *next;
-} MOUNTED_FS_STRUCT;
-static MOUNTED_FS_STRUCT *DSF_Head = NULL;      /* Points to the first entry of mounted_fs_struct list */
-static MOUNTED_FS_STRUCT *DSF_Tail = NULL;      /* Points to the last entry of mounted_fs_struct list */
-static void add_mounted_fs_struct (MOUNTED_FS_STRUCT *DSFptr);
-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_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);
 
 /* Do we use extended attributes and acl ? 
@@ -161 +146 @@
 
 /**
- * Frees the memory for all of the structures on the linked list of 
- * all of the non-NETFS mounted file systems.
- */
-static void free_mounted_fs_list (void) {
-    MOUNTED_FS_STRUCT *DSFptr = NULL;
-    MOUNTED_FS_STRUCT *DSFnext = NULL;
- 
-    DSFptr = DSF_Head;
-    while (DSFptr != NULL) {
-        DSFnext = DSFptr->next;
-        mr_free(DSFptr);
-        DSFptr = DSFnext;
-    }
-    DSF_Head = NULL;
-    DSF_Tail = NULL;
-}
-
-/**
- * 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. 
- * @return None. 
- */
-static void add_mounted_fs_struct (MOUNTED_FS_STRUCT *DSFptr)
-{
-    assert (DSFptr);
-    if (DSF_Head == NULL) {
-        DSF_Head = DSFptr;
-    } else {
-        DSF_Tail->next = DSFptr;
-    }
-    DSFptr->next = NULL;
-    DSF_Tail = DSFptr;
-}
-
-/**
- * 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 
- * @return NULL if it didn't find the device, a pointer to the
- * structure if it did. 
- */
-static MOUNTED_FS_STRUCT *find_device_in_list (const char *device)
-{
-    MOUNTED_FS_STRUCT *DSFptr = NULL;
-
-    DSFptr = DSF_Head;
-    while (DSFptr != NULL) {
-        if (!strcmp(DSFptr->device, device)) {
-            break;
-        }
-        DSFptr = DSFptr->next;
-    }
-    return (DSFptr);
-}
-
-/**
- * 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 
- * @return NULL is it didn't find the mount point, a pointer to the
- * structure if it did. 
- */
-static MOUNTED_FS_STRUCT *find_mount_point_in_list (const char *mount_point)
-{
-    MOUNTED_FS_STRUCT *DSFptr = NULL;
-
-    DSFptr = DSF_Head;
-    while (DSFptr != NULL) {
-        if (!strcmp(DSFptr->mount_point, mount_point)) {
-            break;
-        }
-        DSFptr = DSFptr->next;
-    }
-    return (DSFptr);
-}
-
-/**
- * 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_NETFS_mounted_file_systems (void)
-{
-    int i = 0;
-    int mount_cnt = 0;
-    char *mounted_file_system = NULL;
-    char *command = NULL;
-    char *token = NULL;
-    char token_chars[] =" :\t\r\f\a\0";
-    MOUNTED_FS_STRUCT *DSFptr = NULL;
-
-    free_mounted_fs_list();
-    /********
-    * Find the number of mounted file system entries and their respective mount points. 
-    * I can't return all of the entries as one string because it's length can be longer
-    * than MAX_STR_LEN which is used in call_program_and_get_last_line_of_output(). 
-    * So start looping and get the number of  mounted file systems and query them one by one.
-    ********/
-    /* Get the number of mounted file systems ((those that start with "/dev/" */
-    mr_asprintf(command, "mount 2>/dev/null | awk '{if($1 ~ \"^/dev/\"){print $0}}'|wc -l");
-    log_msg(5, "Running: %s", command);
-    mounted_file_system = call_program_and_get_last_line_of_output(command);
-    mr_free(command);
-
-    mount_cnt = atoi(mounted_file_system);
-    log_msg (5, "mount_cnt: %d", mount_cnt);
-    mr_free(mounted_file_system);
-
-    for (i=mount_cnt; i > 0; i--) {
-        mr_asprintf(command, "mount 2>/dev/null | awk '{if($1 ~ \"^/dev/\"){print $1,$3}}'|head -n %d", i);
-        log_msg(5, "Running: %s", command);
-        mounted_file_system = call_program_and_get_last_line_of_output(command);
-        mr_free(command);
-
-        log_msg (5, "mounted_file_system: %s", mounted_file_system);
-        if ((token = strtok(mounted_file_system, token_chars)) == NULL) {
-            log_msg (4, "Could not get the list of mounted file systems");
-            mr_free(mounted_file_system);
-            mr_free(token);
-            return (1);
-        }
-        if (token) {
-            log_msg (5, "token: %s", token);
-        }
-        while (token != NULL) {
-            log_msg (5, "token: %s", token);
-            if ((DSFptr = (MOUNTED_FS_STRUCT *) calloc(1, sizeof(MOUNTED_FS_STRUCT))) == NULL) {
-                fatal_error ("Cannot allocate memory");
-            }
-            add_mounted_fs_struct(DSFptr);
-            strcpy(DSFptr->device, token);
-            mr_free(token);
-            if ((token = strtok(NULL, token_chars)) == NULL) {
-                log_msg (5, "Ran out of entries on the mounted file systems list");
-                mr_free(mounted_file_system);
-                mr_free(token);
-                return (1);
-            }
-            log_msg (5, "token: %s", token);
-            strcpy(DSFptr->mount_point, token);
-            mr_free(token);
-            token = strtok(NULL, token_chars); 
-        }
-        mr_free(mounted_file_system);
-    }
-    /********
-    * DSFptr = DSF_Head;
-    * while (DSFptr != NULL) {
-    * printf ("Dev: %s  MP: %s  Check: %d\n", DSFptr->device, DSFptr->mount_point, DSFptr->check);
-    * DSFptr = DSFptr->next;
-    * }
-    ********/
-    return (0);
-}
-
-/**
- * Given a whole disk device special file, determine which mounted file systems
- * are on the dsf's partitions and which mounted file systems are not.
- * @param dsf The whole disk device special file.
- * @param included_dsf_list A char pointer used to hold the list of mount points
- * that are on the dsf. Memory for the array will be allocated within the function.
- * @param excluded_dsf_list A char pointer used to hold the list of mount points
- * that are not on the dsf. Memory for the array will be allocated within the function.
- * @return 0 on success, -1 if no device special file was passed in, -2 if a device
- * special file was passed in but it has no partitions on it, or 1 on failure 
- */
-static int get_dsf_mount_list (const char *dsf, char **included_dsf_list, char **excluded_dsf_list) {
-    int i = 0;
-    int c = 0;
-    int lastpos = 0;
-    char *VG = NULL;
-    char *tmp = NULL;
-    char *command = NULL;
-    char *partition_list = NULL;
-    char partitions[64][MAX_STR_LEN];
-    char *mount_list = NULL;
-    char *token = NULL;
-    char token_chars[] =" \t\r\f\a\0";
-    MOUNTED_FS_STRUCT *DSFptr = NULL;
-
-    memset((char *)partitions, 0, sizeof(partitions));
-
-    log_msg(5, "dsf: %s", dsf);
-
-    /********
-    * See if a device special file was passed in (i.e. it must start with /dev/
-    ********/
-    if (strncmp(dsf, "/dev/", 5)) {
-        log_msg (5, "%s does not start with /dev/ and (probably) is not a  device special file", dsf);
-        return (-1);
-    }
-    log_msg(5, "  %s looks like a device special file", dsf);
-    /* Verify that the dsf exists */ 
-    mr_asprintf(command, "ls -al %s 2>/dev/null | wc -l", dsf);
-    log_msg(5, "  Executing: %s", command);
-    tmp = call_program_and_get_last_line_of_output(command);
-    mr_free(command);
-
-    log_msg(5, "  Return value: %s", tmp);
-    c = atoi(tmp);
-    mr_free(tmp);
-
-    if (!c) {
-        log_to_screen("Cannot find device special file %s", dsf);
-        return (1);
-    }
-    log_msg(5, "  %s device special file exists", dsf);
-
-    /* Get a list of the 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);
-    }
-    log_msg (5, "Processing dsf: %s", dsf);
-    /********
-    * Get a list of the dsf's partitions. There could be no partitions on the disk
-    * or a dsf of a partition was passed in (e.g. /dev/sda1 instead of /dev/sda).
-    * Either way, it's an error.
-    ********/
-    mr_asprintf(command, "parted2fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf);
-    log_msg(4, "Executing: %s", command);
-    partition_list = call_program_and_get_last_line_of_output(command);
-    mr_free(command);
-    log_msg(4, "Partition list for %s: %s", dsf, partition_list);
-    if (!strlen(partition_list)) {
-        /* There were no partitions on the disk */
-        log_msg(4, "Cannot find any partitions on device special file %s", dsf);
-        return (-2);
-    }
-
-    /* Fill the partition list */
-    i = 0;
-    lastpos = 0;
-    while ((token = mr_strtok(partition_list, token_chars, &lastpos)) != NULL) {
-        log_msg (5, "Found partition: %s", token);
-        strcpy(partitions[i++], token);
-        mr_free(token);
-    }
-    mr_free(partition_list);
-  
-    /********
-     * At this point, we have a list of all of the partitions on the dsf. Now try to
-     * see which partitions have a file system on them. 
-     *
-     * Loop through each partition on the disk and:
-     *
-     * - If the partition is swap, it ignores it.
-     *
-     * - If the partition is mounted (e.g. /dev/sda1 is mounted on /boot), it adds an entry 
-     *  to the linked list, copies to it the device name and mount point, and sets check == 1.
-     *
-     * - If the partition is part of a Volume Group that has Logical Volumes mounted, it adds 
-     *  an entry to the linked list for each mounted Logical Volume in that Volume Group, copying 
-     *  to it the device name and mount point, and sets check == 1. Note that if the Volume Group 
-     *  contains more than one disk, it will still add the entry even if the Logical Volume's 
-     *  extents are not on the dsf that was passed in to the function. For example, Volume Group 
-     *  VolGroup00 contains the disks /dev/sda1 and /dev/sdb1, and the Logical Volumes LogVol01, 
-     *  which is mounted on /var and has all of its extents on /dev/sda1, and LogVol02, which is 
-     *  mounted as /usr and has all of its extents on /dev/sdb1. If you pass /dev/sda into the 
-     *  function, both /var and /usr will be archived even though /usr is actually on/dev/sdb.
-     *
-     * - If the partition is part of a Volume Group that has Logical Volumes used in a mounted 
-     *  software raid device, it adds an entry to the linked list, copies to it the software raid 
-     *  device name and mount point, and sets check == 1.
-     *
-     * - If the partition is part of a mounted software raid device, it adds an entry to the linked 
-     *  list, copies to it the software raid device name and mount point, and sets check == 1.
-     *
-     ********/
-    for (i=0; strlen(partitions[i]); i++) {
-        log_msg(4, "Processing partition: %s", partitions[i]);
-        /* See if it's swap. If it is, ignore it. */
-        mr_asprintf(command, "parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", 
-          dsf, partitions[i]);
-        log_msg(4, "  Running: %s", command);
-        tmp = call_program_and_get_last_line_of_output(command);
-        mr_free(command);
-
-        log_msg(4, "  Return value: %s", tmp);
-        c = strlen(tmp);
-        mr_free(tmp);
-
-        if (c) {
-            log_msg(4, "It's swap. Ignoring partition %s", partitions[i]); 
-            continue;
-        } 
-        /* It's not swap. See if we can find the mount point from the mount command. */
-        mr_asprintf(command, "mount 2>/dev/null | awk '{if((NF>0)&&($1==\"%s\")){print $3}}'", partitions[i]);
-        tmp = call_program_and_get_last_line_of_output(command);
-        mr_free(command);
-
-        if (strlen(tmp)) {
-            log_msg(4, "  %s is mounted: %s", partitions[i], tmp);
-            if ((DSFptr = find_mount_point_in_list(tmp)) == NULL) {
-                log_msg (4, "Can't find mount point %s in mounted file systems list", tmp);
-                mr_free(tmp);
-                return (1);
-            }
-            DSFptr->check = 1;
-            mr_free(tmp);
-            continue;
-        }
-        mr_free(tmp);
-        /* It's not swap and it's not mounted. See if it's LVM */
-        log_msg(4, "  It's not mounted. Checking to see if it's LVM...");
-        /* Get the partition ID; 8e for LVM */
-        mr_asprintf(command, "parted2fdisk -l %s |awk '{if($1 ~ \"^%s\"){print $5}}'", dsf, partitions[i]);
-        log_msg(4, "  Running: %s", command);
-        tmp = call_program_and_get_last_line_of_output(command);
-        mr_free(command);
-        if (strlen(tmp)) {
-            log_msg(4, "  Partition ID: %s", tmp);
-            if (!strcasecmp(tmp, "8e")) {
-                /* It's LVM: Find the VG it's in */
-                log_msg(4, "  It's LVM: Find the VG it's in...");
-                mr_asprintf(command, "pvdisplay -v %s 2>/dev/null|grep \"VG Name\"|awk '{print $NF}'", partitions[i]);
-                log_msg(4, "  Running: %s", command);
-                VG = call_program_and_get_last_line_of_output(command);
-                mr_free(command);
-                log_msg(4, "  Volume Group: %s", VG);
-                if (strlen(VG)) {
-                    /* Found the Volume Group. Now find all of the VG's mount points */
-                    log_msg(4, "  Found the Volume Group. Now find all of the VG's mount points");
-                    mr_asprintf(command, "mount 2>/dev/null|grep -E \"/dev/mapper/%s-|/dev/%s/\"|awk '{printf(\"%%s \",$3)}END{print \"\"}'", VG, VG);
-                    log_msg(4, "  Running: %s", command);
-                    mount_list = call_program_and_get_last_line_of_output(command);
-                    mr_free(command);
-
-                    log_msg(4, "  VG %s mount_list: %s", VG, mount_list);
-                    lastpos = 0;
-                    while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
-                        log_msg (5, "mount point token: %s", token);
-                        if ((DSFptr = find_mount_point_in_list(token)) == NULL) {
-                            log_msg (4, "Can't find mount point %s in mounted file systems list", token);
-                            mr_free(tmp);
-                            mr_free(token);
-                            mr_free(VG);
-                            return (1);
-                        }
-                        DSFptr->check = 1;
-                        mr_free(token);
-                    }
-                    /********
-                     * Now we want to see if there are any software raid devices using
-                     * any of the Logical Volumes on the Volume Group.
-                     *******/
-                    mr_free(mount_list);
-                    mr_asprintf(command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
-                    log_msg (5, "Running: %s", command);
-                    mount_list = call_program_and_get_last_line_of_output(command);
-                    mr_free(command);
-                    log_msg(4, "  Software raid device list: %s", mount_list);
-                    lastpos = 0;
-                    while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
-                        mr_asprintf(command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, VG);
-                        log_msg (5, "Running: %s", command);
-                        mr_free(tmp);
-
-                        tmp = call_program_and_get_last_line_of_output(command);
-                        mr_free(command);
-
-                        log_msg(4, "Number of Software raid device: %s", tmp);
-                        if (atoi(tmp)) {
-                            /* This device is on our disk */
-                            if ((DSFptr = find_device_in_list(token)) == NULL) {
-                                log_msg (4, "Can't find device %s in mounted file systems list", token);
-                                mr_free(tmp);
-                                mr_free(token);
-                                mr_free(VG);
-                                return (1);
-                            }
-                            DSFptr->check = 1;
-                        }
-                        mr_free(token);
-                    }
-                    mr_free(mount_list);
-                } else {
-                    log_msg (4, "Error finding Volume Group for partition %s", partitions[i]);
-                    mr_free(tmp);
-                    mr_free(VG);
-                    return (1);
-                }
-                mr_free(tmp);
-                mr_free(VG);
-                continue;
-            }
-        } else {
-            log_msg (4, "Error finding partition type for the partition %s", partitions[i]);
-        }
-        mr_free(tmp);
-        /********
-         * It's not swap, mounted, or LVM. See if it's used in a software raid device.
-         ********/
-        log_msg (5, "It's not swap, mounted, or LVM. See if it's used in a software raid device.");
-        mr_asprintf(command, "mdadm --examine %s 2>/dev/null | awk '{if($1 == \"UUID\"){print $3}}'", partitions[i]);
-        log_msg(4, "  Running: %s", command);
-        tmp = call_program_and_get_last_line_of_output(command);
-        mr_free(command);
-        if (!strlen(tmp)) {
-            log_msg(4, "  Partition %s is not used in a non-LVM software raid device", partitions[i]);
-            mr_free(tmp);
-            continue;
-        }
-        log_msg (5, "  UUID: %s", tmp);
-        /* Get the Software raid device list */
-        mr_asprintf(command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
-        log_msg (5, "  Running: %s", command);
-        mount_list = call_program_and_get_last_line_of_output(command);
-        mr_free(command);
-        log_msg(4, "  Software raid device list: %s", mount_list);
-        /* Loop through the software raid device list to see if we can find the partition */
-        lastpos = 0;
-        while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
-            mr_asprintf(command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, tmp);
-            log_msg(4, "  Running: %s", command);
-            mr_free(tmp);
-            tmp = call_program_and_get_last_line_of_output(command);
-            mr_free(command);
-            if (!atoi(tmp)) {
-                log_msg (4,"  Didn't find partition %s in software raid device %s", partitions[i], token);
-            } else {
-                if ((DSFptr = find_device_in_list(token)) == NULL) {
-                    log_msg (4, "Can't find device %s in mounted file systems list", token);
-                    mr_free(tmp);
-                    mr_free(token);
-                    return (1);
-                }
-                DSFptr->check = 1;
-                break;
-            }
-            mr_free(token);
-        }
-        mr_free(tmp);
-    }
-    mr_free(partition_list);
-    mr_free(mount_list);
-
-    /* Determine how much memory to allocate for included_dsf_list and excluded_dsf_list */
-    i = 0;
-    DSFptr= DSF_Head;
-    while (DSFptr != NULL) {
-        i += strlen(DSFptr->mount_point) + 1;
-        DSFptr = DSFptr->next;
-    }
-    log_msg (5, "i: %d", i);
-    if ((*included_dsf_list = (char *) calloc(i+100, sizeof(char))) == NULL) {
-        fatal_error ("Cannot allocate memory");
-    }
-    if ((*excluded_dsf_list = (char *) calloc(i+100, sizeof(char))) == NULL) {
-        fatal_error ("Cannot allocate memory");
-    }
-    DSFptr= DSF_Head;
-    while (DSFptr != NULL) {
-        if (DSFptr->check) {
-            log_msg (5, "%s is mounted on %s and is on disk %s\n", DSFptr->device, DSFptr->mount_point, dsf);
-            strcat(*included_dsf_list, DSFptr->mount_point);
-            strcat(*included_dsf_list, " ");
-        } else {
-            log_msg (4, "%s is mounted on %s and is NOT on disk %s\n", DSFptr->device, DSFptr->mount_point, dsf);
-            strcat(*excluded_dsf_list, DSFptr->mount_point);
-            strcat(*excluded_dsf_list, " ");
-        }
-        DSFptr = DSFptr->next;
-    }
-    log_msg (5, "included_dsf_list: %s", *included_dsf_list);
-    log_msg (5, "excluded_dsf_list: %s", *excluded_dsf_list);
-    return (0);
-}
-
-
-/**
  * Process mondoarchive's command-line switches.
  * @param bkpinfo The backup information structure to populate.
@@ -659 +171 @@
     char *p = NULL;
     char *q = NULL;
-    char *token = NULL;
-    char *mounted_on_dsf = NULL;
-    char *not_mounted_on_dsf = NULL;
-    char token_chars[] =" \t\r\f\a\0";
 
     long itbs = 0L;
@@ -777 +285 @@
         }
         mr_free(tmp1);
-        while ((token = mr_strtok(flag_val['I'], token_chars, &lastpos)) != NULL) {
-            switch (get_dsf_mount_list(token, &mounted_on_dsf, &not_mounted_on_dsf)) {
-            /* It's a dsf but not a whole disk dsf */
-            case -2:
-                log_to_screen("Could %s be a partition instead of a whole disk device special file?\n Ignored.", token);
-                break;
-            /* Fatal error; exit */
-            case 1: 
-                mr_free(token);
-                fatal_error("Error processing -I option");
-            /* Everything is OK; process to archive data */
-            case 0:
-                log_to_screen("Archiving only the following file systems on %s:\n", token);
-                log_to_screen("  %s\n", mounted_on_dsf);
-                mr_asprintf(p, "/");
-                mr_free(bkpinfo->include_paths);
-                bkpinfo->include_paths = p;
-                if (strlen(not_mounted_on_dsf)) {
-                    log_msg (5, "Adding to bkpinfo->exclude_paths due to -I option: %s", not_mounted_on_dsf);
-                    log_to_screen("Not archiving the following file systems:\n");
-                    log_to_screen("  %s\n", not_mounted_on_dsf);
-                    mr_strcat(bkpinfo->exclude_paths, " %s ", not_mounted_on_dsf);
-                }
-                break;
-            /* A device special file was not passed in. Process it as a path. */
-            case -1:
-                mr_strcat(bkpinfo->include_paths, " %s ", token);
-                break; 
-            }
-            mr_free(token);
-        }
-        if (bkpinfo->include_paths != NULL) {
-            mr_strip_spaces(bkpinfo->include_paths);
-            log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
-        }
-        if (bkpinfo->exclude_paths != NULL) {
-            mr_strip_spaces(bkpinfo->exclude_paths);
-            log_msg(1, "exclude_paths is now '%s'", bkpinfo->exclude_paths);
-        }
+        mr_make_devlist_from_pathlist(flag_val['I'], 'I');
         log_msg(4, "Finished with the -I option");
     }
@@ -978 +448 @@
         }
         /* test for protocol */
-        p = strchr(bkpinfo->netfs_mount, ':');
+        p = strstr(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");
+            /* protocol not found assuming NFS for compatibility */
+            mr_asprintf(q,"nfs");
+
+            p = strchr(bkpinfo->netfs_mount, ':');
+            if (p == NULL) {
+                fatal_error("No protocol specified for remote share mount, nor any old NFS syntax found.\nPlease do man mondoarchive as syntax changed");
+            }
+            /* p points on to the string server:/path */
+            p = bkpinfo->netfs_mount;
+
         } else {
-            /* Proto found. Store the 2 values */
-            bkpinfo->netfs_proto = bkpinfo->netfs_mount;
+            /* Isolate the protocol */
+            *p = '\0';
+            mr_asprintf(q,"%s",bkpinfo->netfs_mount);
+
+            /* Skip proto now */
             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");
-            }
             p++;
-            /* p points on to the string server:/path */
-            bkpinfo->netfs_mount = p;
-
-            /* new netfs mount - remove :// from proto */
-            /* going back to protocol */
-            p--;
-            p--;
-            p--;
-            *p = '\0';
-        }
+        }
+        /* whatever done before proto is pointed to by q */
+        bkpinfo->netfs_proto = q;
+
+        /* p points on to the string server:/path */
+        /* Store the 2 values */
+        bkpinfo->netfs_mount = p;
+
         /* test if we specified a user */
         p = strchr(bkpinfo->netfs_mount, '@');
@@ -1134 +607 @@
         mr_free(tmp1);
         lastpos = 0;
-        while ((token = mr_strtok(flag_val['E'], token_chars, &lastpos)) != NULL) {
-            switch (get_dsf_mount_list(token, &mounted_on_dsf, &not_mounted_on_dsf)) {
-            case 1: 
-                log_msg(1, "WARNING ! a path doesn't exist in -E option");
-                break;
-            /* Everything is OK; proceed to archive data */
-            case 0:
-                if (strlen(mounted_on_dsf)) {
-                    log_to_screen("Excluding the following file systems on %s:\n", token);
-                    log_to_screen("  %s\n", mounted_on_dsf);
-                    log_msg (5, "Adding to bkpinfo->exclude_paths due to -E option: %s", mounted_on_dsf);
-                    mr_strcat(bkpinfo->exclude_paths, " %s ", mounted_on_dsf);
-                }
-                break;
-            /* It's a dsf but not a whole disk dsf */
-            case -2:
-                log_to_screen("Could %s be a partition instead of a whole disk device special file?\nIgnored.", token);
-                break;
-            /* A device special file was not passed in. Process it as a path. */
-            case -1:
-                mr_strcat(bkpinfo->exclude_paths, " %s ", token);
-                break;
-            }
-            mr_free(token);
-        }
-        if (bkpinfo->exclude_paths != NULL) {
-            log_msg(1, "exclude_paths is now '%s'", bkpinfo->exclude_paths);
-        }
+
+        mr_make_devlist_from_pathlist(flag_val['E'], 'E');
         log_msg(4, "Finished with the -E option");
     }

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

@@ -10 +10 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 #include "mondostructures.h"
 #include "libmondo-files-EXT.h"
@@ -61 +62 @@
 extern struct s_bkpinfo *bkpinfo;
 
-
+/* Stuff that handles the -I and -E option when a whole disk DSF is used */
+typedef struct mounted_fs_struct {
+    char device[MAX_STR_LEN];       /* The name of the device */
+    char mount_point[MAX_STR_LEN];  /* The devices mount point */
+    unsigned char check;            /* 1 == included on DSF */
+    struct mounted_fs_struct *next;
+} MOUNTED_FS_STRUCT;
+
+static MOUNTED_FS_STRUCT *DSF_Head = NULL;      /* Points to the first entry of mounted_fs_struct list */
+static MOUNTED_FS_STRUCT *DSF_Tail = NULL;      /* Points to the last entry of mounted_fs_struct list */
 
 
@@ -1073 +1083 @@
     mr_free(incoming);
     mr_free(device_with_tab);
-    mr_free(device_with_space);
     paranoid_pclose(fin);
     mr_asprintf(tmp, "%s | grep -E \"^%s\" > /dev/null 2> /dev/null", SWAPLIST_COMMAND, device_with_space);
+    mr_free(device_with_space);
     log_msg(4, "tmp (command) = '%s'", tmp);
     if (!system(tmp)) {
@@ -1100 +1110 @@
     int i = 2;
 
-    tmp = call_program_and_get_last_line_of_output("/sbin/sysctl -n kern.osreldate"));
+    tmp = call_program_and_get_last_line_of_output("/sbin/sysctl -n kern.osreldate");
     i = atoi(tmp);
     mr_free(tmp);
@@ -1390 +1400 @@
 
 /* @} - end of deviceGroup */
-
-
-/**
- * Ask user for details of backup/restore information.
- * Called when @c mondoarchive doesn't get any parameters.
- * @param bkpinfo The backup information structure to fill out with the user's data.
- * @param archiving_to_media TRUE if archiving, FALSE if restoring.
- * @return 0, always.
- * @bug No point of `int' return value.
- * @ingroup archiveGroup
- */
-int interactively_obtain_media_parameters_from_user(bool archiving_to_media)
-// archiving_to_media is TRUE if I'm being called by mondoarchive
-// archiving_to_media is FALSE if I'm being called by mondorestore
-{
-    char *tmp = NULL;
-    char *p = NULL;
-    char *mds = NULL;
-    char *sz_size = NULL;
-    char *command = NULL;
-    char *comment = NULL;
-    int i;
-    FILE *fin;
-
-    assert(bkpinfo != NULL);
-    bkpinfo->nonbootable_backup = FALSE;
-
-    // Tape, CD, NETFS, ...?
-    srandom(getpid());
-    bkpinfo->backup_media_type =
-        (g_restoring_live_from_cd) ? cdr :
-        which_backup_media_type(bkpinfo->restore_data);
-    if (bkpinfo->backup_media_type == none) {
-        log_to_screen("User has chosen not to backup the PC");
-        finish(1);
-    }
-    /* Why asking to remove the media with tape ?
-    if (bkpinfo->backup_media_type == tape && bkpinfo->restore_data) {
-        popup_and_OK("Please remove media from drive(s)");
-    }
-    */
-    tmp = bkptype_to_string(bkpinfo->backup_media_type);
-    log_msg(3, "media type = %s", tmp);
-    mr_free(tmp);
-
-    bkpinfo->cdrw_speed = (bkpinfo->backup_media_type == cdstream) ? 2 : 4;
-    bkpinfo->compression_level = (bkpinfo->backup_media_type == cdstream) ? 1 : 5;
-    bkpinfo->use_lzo = (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
-    mvaddstr_and_log_it(2, 0, " ");
-
-    // Find device's /dev (or SCSI) entry
-    switch (bkpinfo->backup_media_type) {
-    case cdr:
-    case cdrw:
-    case dvd:
-    case usb:
-        /* Never try to eject a USB device */
-        if (bkpinfo->backup_media_type == usb) {
-            bkpinfo->please_dont_eject = TRUE;
-        }
-        if (archiving_to_media) {
-            if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
-                if (ask_me_yes_or_no("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")) {
-                    bkpinfo->manual_cd_tray = TRUE;
-                }
-            }
-            if ((bkpinfo->compression_level = which_compression_level()) == -1) {
-                log_to_screen("User has chosen not to backup the PC");
-                finish(1);
-            }
-            mds = media_descriptor_string(bkpinfo->backup_media_type);
-            mr_asprintf(comment, "What speed is your %s (re)writer?", mds);
-            mr_free(bkpinfo->media_device);
-            if (bkpinfo->backup_media_type == dvd) {
-                bkpinfo->media_device = find_dvd_device();
-                mr_asprintf(tmp, "1");
-                mr_asprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
-                log_msg(1, "Setting to DVD defaults");
-            } else {
-                mr_asprintf(bkpinfo->media_device, "%s", VANILLA_SCSI_CDROM);
-                mr_asprintf(tmp, "4");
-                mr_asprintf(sz_size, "%d", 650);
-                log_msg(1, "Setting to CD defaults");
-            }
-            if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
-                p = popup_and_get_string("Speed", comment, tmp);
-                mr_free(tmp);
-
-                if (p == NULL) {
-                    log_to_screen("User has chosen not to backup the PC");
-                    mr_free(comment);
-                    finish(1);
-                }
-                /* tmp now has the new value given by the user */
-                tmp = p;
-            }
-            mr_free(comment);
-
-            bkpinfo->cdrw_speed = atoi(tmp);    // if DVD then this shouldn't ever be used anyway :)
-            mr_free(tmp);
-
-            mr_asprintf(comment, "How much data (in Megabytes) will each %s store?", mds);
-            mr_free(mds);
-            p = popup_and_get_string("Size", comment, sz_size);
-            mr_free(sz_size);
-            mr_free(comment);
-
-            if (p == NULL) {
-                log_to_screen("User has chosen not to backup the PC");
-                finish(1);
-            }
-            sz_size = p;
-
-            for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                bkpinfo->media_size[i] = atoi(sz_size);
-            }
-
-            if (bkpinfo->media_size[0] <= 0) {
-                log_to_screen("User has chosen not to backup the PC");
-                finish(1);
-            }
-        }
-        /* No break because we continue even for usb */
-    case cdstream:
-        mds = media_descriptor_string(bkpinfo->backup_media_type);
-
-        mr_free(bkpinfo->media_device);
-        if ((bkpinfo->disaster_recovery) && (bkpinfo->backup_media_type != usb)) {
-            mr_asprintf(bkpinfo->media_device, "/dev/cdrom");
-            log_msg(2, "CD-ROM device assumed to be at %s", bkpinfo->media_device);
-        } else if ((bkpinfo->restore_data && (bkpinfo->backup_media_type != usb)) || bkpinfo->backup_media_type == dvd) {
-            if ((bkpinfo->backup_media_type == dvd) || ((bkpinfo->media_device = find_cdrom_device(FALSE)) != NULL)) {
-                mr_asprintf(comment, "Please specify your %s drive's /dev entry", mds);
-                p = popup_and_get_string("Device?", comment, bkpinfo->media_device);
-                mr_free(comment);
-
-                if (p == NULL) {
-                    log_to_screen("User has chosen not to backup the PC");
-                    finish(1);
-                }
-                mr_free(bkpinfo->media_device);
-                bkpinfo->media_device = p;
-            }
-            if (bkpinfo->media_device != NULL) {
-                log_msg(2, "%s device found at %s", mds, bkpinfo->media_device);
-            } else {
-                log_msg(2, "%s device not found (bkpinfo->media_device is NULL)", mds);
-            }
-        } else {
-            if (((bkpinfo->media_device = find_cdrw_device()) != NULL) && (bkpinfo->backup_media_type != usb)) {
-                mr_free(bkpinfo->media_device);
-            }
-            if (bkpinfo->media_device != NULL) {
-                if (bkpinfo->backup_media_type == usb) {
-                    mr_asprintf(tmp, "I think your %s media corresponds to %s. Is this correct?", mds, bkpinfo->media_device);
-                } else {
-                    mr_asprintf(tmp, "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)", mds, bkpinfo->media_device);
-                }
-                if (!ask_me_yes_or_no(tmp)) {
-                    mr_free(bkpinfo->media_device);
-                }
-                mr_free(tmp);
-            }
-            if (!bkpinfo->media_device) {
-                if (bkpinfo->backup_media_type == usb) {
-                    p = popup_and_get_string("/dev entry?", "What is the /dev entry of your USB Disk/Key, please?", NULL);
-                } else {
-                    if (g_kernel_version < 2.6) {
-                        p = popup_and_get_string("Device node?", "What is the SCSI node of your CD (re)writer, please?", NULL);
-                    } else {
-                        p = popup_and_get_string("/dev entry?", "What is the /dev entry of your CD (re)writer, please?", NULL);
-                    }
-                }
-                if (p == NULL) {
-                    log_to_screen("User has chosen not to backup the PC");
-                    finish(1);
-                }
-                bkpinfo->media_device = p;
-            }
-        }
-        mr_free(mds);
-
-        if (bkpinfo->backup_media_type == cdstream) {
-            for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                bkpinfo->media_size[i] = 650;
-            }
-        }
-        break;
-    case udev:
-        if (!ask_me_yes_or_no
-            ("This option is for advanced users only. Are you sure?")) {
-            log_to_screen("User has chosen not to backup the PC");
-            finish(1);
-        }
-    case tape:
-
-        mr_free(bkpinfo->media_device);
-        if ((!bkpinfo->restore_mode) && ((bkpinfo->media_device = mr_find_tape_device()) == NULL)) {
-            log_msg(3, "Ok, using vanilla scsi tape.");
-            mr_asprintf(bkpinfo->media_device, "%s", VANILLA_SCSI_TAPE);
-            if ((fin = fopen(bkpinfo->media_device, "r"))) {
-                paranoid_fclose(fin);
-            } else {
-                mr_free(bkpinfo->media_device);
-                mr_asprintf(bkpinfo->media_device, "/dev/osst0");
-            }
-        }
-        if (bkpinfo->media_device != NULL) {
-            if ((fin = fopen(bkpinfo->media_device, "r"))) {
-                paranoid_fclose(fin);
-            } else {
-                if (does_file_exist("/tmp/mondo-restore.cfg")) {
-                    mr_free(bkpinfo->media_device);
-                    bkpinfo->media_device = read_cfg_var("/tmp/mondo-restore.cfg", "media-dev");
-                }
-            }
-        }
-        if (bkpinfo->media_device != NULL) {
-            mr_asprintf(tmp, "I think I've found your tape streamer at %s; am I right on the money?", bkpinfo->media_device);
-            if (!ask_me_yes_or_no(tmp)) {
-                mr_free(bkpinfo->media_device);
-            }
-            mr_free(tmp);
-        }
-        if (bkpinfo->media_device == NULL) {
-            p = popup_and_get_string("Device name?", "What is the /dev entry of your tape streamer?", bkpinfo->media_device);
-            if (p == NULL) {
-                log_to_screen("User has chosen not to backup the PC");
-                finish(1);
-            }
-            bkpinfo->media_device = p;
-        }
-        mr_asprintf(tmp, "ls -l %s", bkpinfo->media_device);
-        if (run_program_and_log_output(tmp, FALSE)) {
-            log_to_screen("User has not specified a valid /dev entry");
-            finish(1);
-        }
-        mr_free(tmp);
-
-        bkpinfo->use_obdr = ask_me_yes_or_no("Do you want to activate OBDR support for your tapes ?");
-        bkpinfo->media_size[0] = 0;
-        log_msg(4, "media_size[0] = %ld", bkpinfo->media_size[0]);
-        if (bkpinfo->media_size[0] <= 0) {
-            bkpinfo->media_size[0] = 0;
-        }
-        for (i = 1; i <= MAX_NOOF_MEDIA; i++) {
-            bkpinfo->media_size[i] = bkpinfo->media_size[0];
-        }
-        if (archiving_to_media) {
-            if ((bkpinfo->compression_level =
-                 which_compression_level()) == -1) {
-                log_to_screen("User has chosen not to backup the PC");
-                finish(1);
-            }
-        }
-        break;
-
-
-
-    case netfs:
-        /* Never try to eject a NETFS device */
-        bkpinfo->please_dont_eject = TRUE;
-
-        /* Initiate bkpinfo netfs_mount path from running environment if not already done */
-        if (bkpinfo->netfs_mount == NULL) {
-            bkpinfo->netfs_mount = call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1");
-        }
-#ifdef __FreeBSD__
-        if (TRUE)
-#else
-        if (!bkpinfo->disaster_recovery)
-#endif
-        {
-            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->netfs_mount);
-            bkpinfo->netfs_mount = p;
-            if (!bkpinfo->restore_data) {
-                if ((bkpinfo->compression_level =
-                     which_compression_level()) == -1) {
-                    log_to_screen("User has chosen not to backup the PC");
-                    finish(1);
-                }
-            }
-            // check whether already mounted - we better remove
-            // surrounding spaces and trailing '/' for this
-            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);
-            bkpinfo->isodir = call_program_and_get_last_line_of_output(command);
-            mr_free(command);
-
-            if (!bkpinfo->restore_data) {
-                mr_asprintf(comment, "How much data (in Megabytes) will each media store?");
-                // BERLIOS: 4480 shouldn't be hardcoded here
-                sz_size = popup_and_get_string("Size", comment, "4480");
-                mr_free(comment);
-                if (sz_size == NULL) {
-                    log_to_screen("User has chosen not to backup the PC");
-                    finish(1);
-                }
-            } else {
-                mr_asprintf(sz_size, "0");
-            }
-            for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                bkpinfo->media_size[i] = atoi(sz_size);
-            }
-            mr_free(sz_size);
-            if (bkpinfo->media_size[0] < 0) {
-                log_to_screen("User has chosen not to backup the PC");
-                finish(1);
-            }
-        }
-        if (bkpinfo->disaster_recovery) {
-            mr_asprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
-            (void)system(command);
-            mr_free(command);
-
-            p = popup_and_get_string("Network protocol", "Which Network protocol should I use?", bkpinfo->netfs_proto);
-            if (p == NULL) {
-                log_to_screen("User has chosen not to backup the PC");
-                finish(1);
-            }
-            mr_free(bkpinfo->netfs_proto);
-            bkpinfo->netfs_proto = p;
-
-            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->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->netfs_mount)) {
-            bkpinfo->isodir = call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f3 | head -n1");
-
-        } else {
-            mr_asprintf(bkpinfo->isodir, "%s/netfsdir", bkpinfo->tmpdir);
-            mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
-            run_program_and_log_output(command, 5);
-            mr_free(command);
-
-            if (bkpinfo->restore_data) {
-                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 {
-                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);
-            mr_free(tmp);
-
-            malloc_string(g_selfmounted_isodir);
-            strcpy(g_selfmounted_isodir, bkpinfo->isodir);
-        }
-        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->netfs_remote_dir);
-        if (p == NULL) {
-            log_to_screen("User has chosen not to backup the PC");
-            finish(1);
-        }
-        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->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);
-        if (p == NULL) {
-            log_to_screen("User has chosen not to backup the PC");
-            finish(1);
-        }
-        mr_free(bkpinfo->prefix);
-        bkpinfo->prefix = p;
-        log_msg(3, "prefix set to %s", bkpinfo->prefix);
-
-        log_msg(3, "Just set netfs_remote_dir to %s", bkpinfo->netfs_remote_dir);
-        log_msg(3, "isodir is still %s", bkpinfo->isodir);
-        break;
-
-    case iso:
-        if (!bkpinfo->disaster_recovery) {
-            p = popup_and_get_string("Storage dir.", "Please enter the full path name to the directory for your ISO images.  Example: /mnt/raid0_0", bkpinfo->isodir);
-            if (p == NULL) {
-                log_to_screen("User has chosen not to backup the PC");
-                finish(1);
-            }
-            bkpinfo->isodir = p;
-
-            if (archiving_to_media) {
-                if ((bkpinfo->compression_level =
-                     which_compression_level()) == -1) {
-                    log_to_screen("User has chosen not to backup the PC");
-                    finish(1);
-                }
-                p = popup_and_get_string("ISO size.", "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s or DVD's you plan to backup to.", sz_size);
-                if (p == NULL) {
-                    log_to_screen("User has chosen not to backup the PC");
-                    finish(1);
-                }
-                for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                    bkpinfo->media_size[i] = atoi(p);
-                }
-                mr_free(p);
-            } else {
-                for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                    bkpinfo->media_size[i] = 650;
-                }
-            }
-        }
-        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);
-        if (p == NULL) {
-            log_to_screen("User has chosen not to backup the PC");
-            finish(1);
-        }
-        mr_free(bkpinfo->prefix);
-        bkpinfo->prefix = p;
-        log_msg(3, "prefix set to %s", bkpinfo->prefix);
-        break;
-
-    default:
-        fatal_error
-            ("I, Mojo Jojo, shall defeat those pesky Powerpuff Girls!");
-    }
-
-    if (archiving_to_media) {
-
-        mr_free(bkpinfo->boot_device);
-#ifdef __FreeBSD__
-#define EXAMPLEBD   "/dev/ad0"
-        bkpinfo->boot_device = call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'");
-#else
-#define EXAMPLEBD   "/dev/hda"
-        bkpinfo->boot_device = call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'");
-#endif
-        i = which_boot_loader(bkpinfo->boot_device);
-        if (i == 'U')           // unknown
-        {
-
-            p = popup_and_get_string("Boot device", "What is your boot device? (e.g. "EXAMPLEBD")", bkpinfo->boot_device);
-#undef EXAMPLEBD
-            if (p == NULL) {
-                log_to_screen("User has chosen not to backup the PC");
-                finish(1);
-            }
-            mr_free(bkpinfo->boot_device);
-            bkpinfo->boot_device = p;
-#ifdef __FreeBSD__
-            i = which_boot_loader(bkpinfo->boot_device);
-#else
-            if (does_string_exist_in_boot_block(bkpinfo->boot_device, "LILO")) {
-                i = 'L';
-            } else
-                if (does_string_exist_in_boot_block(bkpinfo->boot_device, "ELILO")) {
-                i = 'E';
-            } else
-                if (does_string_exist_in_boot_block(bkpinfo->boot_device, "GRUB")) {
-                i = 'G';
-            } else {
-                i = 'U';
-            }
-#endif
-            if (i == 'U') {
-                if (ask_me_yes_or_no("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?")) {
-                    i = 'R';    // raw
-                } else {
-                    log_to_screen("I cannot find your boot loader. Please run mondoarchive with parameters.");
-                    finish(1);
-                }
-            }
-        }
-        bkpinfo->boot_loader = i;
-        mr_free(bkpinfo->include_paths);
-        mr_asprintf(p, "/");
-        bkpinfo->include_paths = p;
-
-        p = popup_and_get_string("Backup paths", "Please enter paths which you want me to backup. The default is '/' (i.e. everything).", bkpinfo->include_paths);
-        if (p == NULL) {
-            log_to_screen("User has chosen not to backup the PC");
-            finish(1);
-        }
-        mr_free(bkpinfo->include_paths);
-        bkpinfo->include_paths = p;
-
-        mr_asprintf(tmp, "%s", list_of_NETFS_mounts_only());
-        if (strlen(tmp) > 2) {
-            mr_strcat(bkpinfo->exclude_paths, " %s",tmp);
-        }
-        mr_free(tmp);
-// NTFS 
-        tmp = call_program_and_get_last_line_of_output("parted2fdisk -l | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'");
-        if (strlen(tmp) > 2) {
-            p = popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp);
-
-            if (p == NULL) {
-                log_to_screen("User has chosen not to backup the PC");
-                finish(1);
-            }
-            mr_free(bkpinfo->image_devs);
-            bkpinfo->image_devs = p;
-        }
-
-
-        p = popup_and_get_string("Exclude paths", "Please enter paths which you do NOT want to backup. Separate them with spaces. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.", bkpinfo->exclude_paths);
-        if (p == NULL) {
-            log_to_screen("User has chosen not to backup the PC");
-            finish(1);
-        }
-        mr_free(bkpinfo->exclude_paths);
-        bkpinfo->exclude_paths = p;
-
-        p = popup_and_get_string("Temporary directory", "Please enter your temporary directory.", bkpinfo->tmpdir);
-        if (p == NULL) {
-            log_to_screen("User has chosen not to backup the PC");
-            finish(1);
-        }
-        mr_free(bkpinfo->tmpdir);
-        bkpinfo->tmpdir = p;
-
-        p = popup_and_get_string("Scratch directory", "Please enter your scratch directory.", bkpinfo->scratchdir);
-        if (p == NULL) {
-            log_to_screen("User has chosen not to backup the PC");
-            finish(1);
-        }
-        mr_free(bkpinfo->scratchdir);
-        bkpinfo->scratchdir = p;
-
-// Interactive mode:
-#ifdef __IA64__
-        bkpinfo->make_cd_use_lilo = TRUE;
-#else
-        bkpinfo->make_cd_use_lilo = FALSE;
-#endif
-        bkpinfo->backup_data = TRUE;
-        bkpinfo->verify_data =
-            ask_me_yes_or_no
-            ("Will you want to verify your backups after Mondo has created them?");
-
-#ifndef __FreeBSD__
-        if (!ask_me_yes_or_no
-            ("Are you confident that your kernel is a sane, sensible, standard Linux kernel? Say 'no' if you are using a Gentoo <1.4 or Debian <3.0, please."))
-#endif
-        {
-            mr_free(bkpinfo->kernel_path);
-            mr_asprintf(bkpinfo->kernel_path, "FAILSAFE");
-        }
-
-        if (!ask_me_yes_or_no
-            ("Are you sure you want to proceed? Hit 'no' to abort.")) {
-            log_to_screen("User has chosen not to backup the PC");
-            finish(1);
-        }
-    } else {
-        bkpinfo->restore_data = TRUE;   // probably...
-    }
-
-    if (bkpinfo->backup_media_type == iso
-        || bkpinfo->backup_media_type == netfs) {
-        g_ISO_restore_mode = TRUE;
-    }
-#ifdef __FreeSD__
-// skip
-#else
-    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->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
-
-    log_it("media device = %s", bkpinfo->media_device);
-    log_it("media size = %ld", bkpinfo->media_size[1]);
-    tmp = bkptype_to_string(bkpinfo->backup_media_type);
-    log_it("media type = %s", tmp);
-    mr_free(tmp);
-
-    if (bkpinfo->prefix) {
-        log_it("prefix = %s", bkpinfo->prefix);
-    }
-    log_it("compression = %ld", bkpinfo->compression_level);
-    if (bkpinfo->include_paths) {
-        log_it("include_paths = '%s'", bkpinfo->include_paths);
-    }
-    if (bkpinfo->exclude_paths) {
-        log_it("exclude_paths = '%s'", bkpinfo->exclude_paths);
-    }
-    log_it("scratchdir = '%s'", bkpinfo->scratchdir);
-    log_it("tmpdir = '%s'", bkpinfo->tmpdir);
-    if (bkpinfo->image_devs) {
-        log_it("image_devs = '%s'", bkpinfo->image_devs);
-    }
-    log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device, bkpinfo->boot_loader);
-    if (bkpinfo->media_size[0] < 0) {
-        if (archiving_to_media) {
-            fatal_error("Media size is less than zero.");
-        } else {
-            log_msg(2, "Warning - media size is less than zero.");
-            bkpinfo->media_size[0] = 0;
-        }
-    }
-    paranoid_free(sz_size);
-    return (0);
-}
-
 
 
@@ -2542 +1923 @@
 /* @} - end of deviceGroup */
 
-
 /**
  * Return the type of partition format (GPT or MBR)
@@ -2573 +1953 @@
 }
 
+/**
+ * Frees the memory for all of the structures on the linked list of 
+ * all of the non-NETFS mounted file systems.
+ */
+static void free_mounted_fs_list (void) {
+    MOUNTED_FS_STRUCT *DSFptr = NULL;
+    MOUNTED_FS_STRUCT *DSFnext = NULL;
+ 
+    DSFptr = DSF_Head;
+    while (DSFptr != NULL) {
+        DSFnext = DSFptr->next;
+        paranoid_free(DSFptr);
+        DSFptr = DSFnext;
+    }
+    DSF_Head = NULL;
+    DSF_Tail = NULL;
+}
+
+/**
+ * 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. 
+ * @return None. 
+ */
+static void add_mounted_fs_struct (MOUNTED_FS_STRUCT *DSFptr)
+{
+    assert (DSFptr);
+    if (DSF_Head == NULL) {
+        DSF_Head = DSFptr;
+    } else {
+        DSF_Tail->next = DSFptr;
+    }
+    DSFptr->next = NULL;
+    DSF_Tail = DSFptr;
+}
+
+/**
+ * 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 
+ * @return NULL if it didn't find the device, a pointer to the
+ * structure if it did. 
+ */
+static MOUNTED_FS_STRUCT *find_device_in_list (char *device)
+{
+    MOUNTED_FS_STRUCT *DSFptr = NULL;
+
+    DSFptr = DSF_Head;
+    while (DSFptr != NULL) {
+        if (!strcmp(DSFptr->device, device)) {
+            break;
+        }
+        DSFptr = DSFptr->next;
+    }
+    return (DSFptr);
+}
+
+/**
+ * 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 
+ * @return NULL is it didn't find the mount point, a pointer to the
+ * structure if it did. 
+ */
+static MOUNTED_FS_STRUCT *find_mount_point_in_list (char *mount_point)
+{
+    MOUNTED_FS_STRUCT *DSFptr = NULL;
+
+    DSFptr = DSF_Head;
+    while (DSFptr != NULL) {
+        if (!strcmp(DSFptr->mount_point, mount_point)) {
+            break;
+        }
+        DSFptr = DSFptr->next;
+    }
+    return (DSFptr);
+}
+
+/**
+ * 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_NETFS_mounted_file_systems (void)
+{
+    int i = 0;
+    int mount_cnt = 0;
+    char *mounted_file_system = NULL;
+    char *command = NULL;
+    char *token = NULL;
+    char token_chars[] =" :\t\r\f\a\0";
+    MOUNTED_FS_STRUCT *DSFptr = NULL;
+
+    free_mounted_fs_list();
+    /********
+    * Find the number of mounted file system entries and their respective mount points. 
+    * I can't return all of the entries as one string because it's length can be longer
+    * than MAX_STR_LEN which is used in call_program_and_get_last_line_of_output(). 
+    * So start looping and get the number of  mounted file systems and query them one by one.
+    ********/
+    /* Get the number of mounted file systems ((those that start with "/dev/" */
+    mr_asprintf(command, "mount 2>/dev/null | awk '{if($1 ~ \"^/dev/\"){print $0}}'|wc -l");
+    log_msg(5, "Running: %s", command);
+    mounted_file_system = call_program_and_get_last_line_of_output(command);
+    mr_free(command);
+
+    mount_cnt = atoi(mounted_file_system);
+    log_msg (5, "mount_cnt: %d", mount_cnt);
+    mr_free(mounted_file_system);
+
+    for (i=mount_cnt; i > 0; i--) {
+        mr_asprintf(command, "mount 2>/dev/null | awk '{if($1 ~ \"^/dev/\"){print $1,$3}}'|head -n %d", i);
+        log_msg(5, "Running: %s", command);
+        mounted_file_system = call_program_and_get_last_line_of_output(command);
+        mr_free(command);
+
+        log_msg (5, "mounted_file_system: %s", mounted_file_system);
+        if ((token = strtok(mounted_file_system, token_chars)) == NULL) {
+            log_msg (4, "Could not get the list of mounted file systems");
+            mr_free(mounted_file_system);
+            mr_free(token);
+            return (1);
+        }
+        if (token) {
+            log_msg (5, "token: %s", token);
+        }
+        while (token != NULL) {
+            log_msg (5, "token: %s", token);
+            if ((DSFptr = (MOUNTED_FS_STRUCT *) calloc(1, sizeof(MOUNTED_FS_STRUCT))) == NULL) {
+                fatal_error ("Cannot allocate memory");
+            }
+            add_mounted_fs_struct(DSFptr);
+            strcpy(DSFptr->device, token);
+            mr_free(token);
+            if ((token = strtok(NULL, token_chars)) == NULL) {
+                log_msg (5, "Ran out of entries on the mounted file systems list");
+                mr_free(mounted_file_system);
+                mr_free(token);
+                return (1);
+            }
+            log_msg (5, "token: %s", token);
+            strcpy(DSFptr->mount_point, token);
+            mr_free(token);
+            token = strtok(NULL, token_chars); 
+        }
+        mr_free(mounted_file_system);
+    }
+    return (0);
+}
+
+
+
+/**
+ * Given a whole disk device special file, determine which mounted file systems
+ * are on the dsf's partitions and which mounted file systems are not.
+ * @param dsf The whole disk device special file.
+ * @param included_dsf_list A char pointer used to hold the list of mount points
+ * that are on the dsf. Memory for the array will be allocated within the function.
+ * @param excluded_dsf_list A char pointer used to hold the list of mount points
+ * that are not on the dsf. Memory for the array will be allocated within the function.
+ * @return 0 on success, -1 if no device special file was passed in, -2 if a device
+ * special file was passed in but it has no partitions on it, or 1 on failure 
+ */
+static int get_dsf_mount_list (const char *dsf, char **included_dsf_list, char **excluded_dsf_list) {
+    int i = 0;
+    int c = 0;
+    int lastpos = 0;
+    char *VG = NULL;
+    char *tmp = NULL;
+    char *command = NULL;
+    char *partition_list = NULL;
+    char partitions[64][MAX_STR_LEN];
+    char *mount_list = NULL;
+    char *token = NULL;
+    char token_chars[] =" \t\r\f\a\0";
+    MOUNTED_FS_STRUCT *DSFptr = NULL;
+
+    memset((char *)partitions, 0, sizeof(partitions));
+
+    log_msg(5, "dsf: %s", dsf);
+
+    /********
+    * See if a device special file was passed in (i.e. it must start with /dev/
+    ********/
+    if (strncmp(dsf, "/dev/", 5)) {
+        log_msg (5, "%s does not start with /dev/ and (probably) is not a  device special file", dsf);
+        return (-1);
+    }
+    log_msg(5, "  %s looks like a device special file", dsf);
+    /* Verify that the dsf exists */ 
+    mr_asprintf(command, "ls -al %s 2>/dev/null | wc -l", dsf);
+    log_msg(5, "Executing: %s", command);
+    tmp = call_program_and_get_last_line_of_output(command);
+    mr_free(command);
+
+    log_msg(5, "  Return value: %s", tmp);
+    c = atoi(tmp);
+    mr_free(tmp);
+
+    if (!c) {
+        log_to_screen("Cannot find device special file %s", dsf);
+        return (1);
+    }
+    log_msg(5, "  %s device special file exists", dsf);
+
+    /* Get a list of the 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);
+    }
+    log_msg (5, "Processing dsf: %s", dsf);
+    /********
+    * Get a list of the dsf's partitions. There could be no partitions on the disk
+    * or a dsf of a partition was passed in (e.g. /dev/sda1 instead of /dev/sda).
+    * Either way, it's an error.
+    ********/
+    mr_asprintf(command, "parted2fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf);
+    log_msg(4, "Executing: %s", command);
+    partition_list = call_program_and_get_last_line_of_output(command);
+    mr_free(command);
+    log_msg(4, "Partition list for %s: %s", dsf, partition_list);
+    if (!strlen(partition_list)) {
+        /* There were no partitions on the disk */
+        log_msg(4, "Cannot find any partitions on device special file %s", dsf);
+        return (-2);
+    }
+
+    /* Fill the partition list */
+    i = 0;
+    lastpos = 0;
+    while ((token = mr_strtok(partition_list, token_chars, &lastpos)) != NULL) {
+        log_msg (5, "Found partition: %s", token);
+        strcpy(partitions[i++], token);
+        mr_free(token);
+    }
+    paranoid_free(partition_list);
+  
+    /********
+     * At this point, we have a list of all of the partitions on the dsf. Now try to
+     * see which partitions have a file system on them. 
+     *
+     * Loop through each partition on the disk and:
+     *
+     * - If the partition is swap, it ignores it.
+     *
+     * - If the partition is mounted (e.g. /dev/sda1 is mounted on /boot), it adds an entry 
+     *  to the linked list, copies to it the device name and mount point, and sets check == 1.
+     *
+     * - If the partition is part of a Volume Group that has Logical Volumes mounted, it adds 
+     *  an entry to the linked list for each mounted Logical Volume in that Volume Group, copying 
+     *  to it the device name and mount point, and sets check == 1. Note that if the Volume Group 
+     *  contains more than one disk, it will still add the entry even if the Logical Volume's 
+     *  extents are not on the dsf that was passed in to the function. For example, Volume Group 
+     *  VolGroup00 contains the disks /dev/sda1 and /dev/sdb1, and the Logical Volumes LogVol01, 
+     *  which is mounted on /var and has all of its extents on /dev/sda1, and LogVol02, which is 
+     *  mounted as /usr and has all of its extents on /dev/sdb1. If you pass /dev/sda into the 
+     *  function, both /var and /usr will be archived even though /usr is actually on/dev/sdb.
+     *
+     * - If the partition is part of a Volume Group that has Logical Volumes used in a mounted 
+     *  software raid device, it adds an entry to the linked list, copies to it the software raid 
+     *  device name and mount point, and sets check == 1.
+     *
+     * - If the partition is part of a mounted software raid device, it adds an entry to the linked 
+     *  list, copies to it the software raid device name and mount point, and sets check == 1.
+     *
+     ********/
+    for (i=0; strlen(partitions[i]); i++) {
+        log_msg(4, "Processing partition: %s", partitions[i]);
+        /* See if it's swap. If it is, ignore it. */
+        mr_asprintf(command, "parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", dsf, partitions[i]);
+        log_msg(4, "  Running: %s", command);
+        tmp = call_program_and_get_last_line_of_output(command);
+        mr_free(command);
+
+        log_msg(4, "  Return value: %s", tmp);
+        c = strlen(tmp);
+        mr_free(tmp);
+
+        if (c) {
+            log_msg(4, "It's swap. Ignoring partition %s", partitions[i]); 
+            continue;
+        } 
+        /* It's not swap. See if we can find the mount point from the mount command. */
+        mr_asprintf(command, "mount 2>/dev/null | awk '{if((NF>0)&&($1==\"%s\")){print $3}}'", partitions[i]);
+        tmp = call_program_and_get_last_line_of_output(command);
+        mr_free(command);
+
+        c = strlen(tmp);
+        mr_free(tmp);
+        if (c) {
+            log_msg(4, "  %s is mounted: %s", partitions[i], tmp);
+            if ((DSFptr = find_mount_point_in_list(tmp)) == NULL) {
+                log_msg (4, "Can't find mount point %s in mounted file systems list", tmp);
+                return (1);
+            }
+            DSFptr->check = 1;
+            continue;
+        }
+
+        /* It's not swap and it's not mounted. See if it's LVM */
+        log_msg(4, "  It's not mounted. Checking to see if it's LVM...");
+
+        /* Get the partition ID; 8e for LVM */
+        mr_asprintf(command, "parted2fdisk -l %s |awk '{if($1 ~ \"^%s\"){print $5}}'", dsf, partitions[i]);
+        log_msg(4, "  Running: %s", command);
+        tmp = call_program_and_get_last_line_of_output(command);
+        mr_free(command);
+
+        c = strlen(tmp);
+        mr_free(tmp);
+        if (c) {
+            log_msg(4, "  Partition ID: %s", tmp);
+            if (!strcasecmp(tmp, "8e")) {
+                /* It's LVM: Find the VG it's in */
+                log_msg(4, "  It's LVM: Find the VG it's in...");
+                mr_asprintf(command, "pvdisplay -v %s 2>/dev/null|grep \"VG Name\"|awk '{print $NF}'", partitions[i]);
+                log_msg(4, "  Running: %s", command);
+                VG = call_program_and_get_last_line_of_output(command);
+                mr_free(command);
+
+                log_msg(4, "  Volume Group: %s", VG);
+                if (strlen(VG)) {
+                    /* Found the Volume Group. Now find all of the VG's mount points */
+                    log_msg(4, "  Found the Volume Group. Now find all of the VG's mount points");
+                    mr_asprintf(command, "mount 2>/dev/null|grep -E \"/dev/mapper/%s-|/dev/%s/\"|awk '{printf(\"%%s \",$3)}END{print \"\"}'", VG, VG);
+                    log_msg(4, "  Running: %s", command);
+                    mount_list = call_program_and_get_last_line_of_output(command);
+                    mr_free(command);
+
+                    log_msg(4, "  VG %s mount_list: %s", VG, mount_list);
+                    lastpos = 0;
+                    while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
+                        log_msg (5, "mount point token: %s", token);
+                        if ((DSFptr = find_mount_point_in_list(token)) == NULL) {
+                            log_msg (4, "Can't find mount point %s in mounted file systems list", token);
+                            mr_free(token);
+                            mr_free(VG);
+                            return (1);
+                        }
+                        DSFptr->check = 1;
+                        mr_free(token);
+                    }
+                    /********
+                     * Now we want to see if there are any software raid devices using
+                     * any of the Logical Volumes on the Volume Group.
+                     *******/
+                    mr_free(mount_list);
+                    mr_asprintf(command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
+                    log_msg (5, "Running: %s", command);
+                    mount_list = call_program_and_get_last_line_of_output(command);
+                    mr_free(command);
+
+                    log_msg(4, "  Software raid device list: %s", mount_list);
+                    lastpos = 0;
+                    while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
+                        mr_asprintf(command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, VG);
+                        log_msg (5, "Running: %s", command);
+
+                        tmp = call_program_and_get_last_line_of_output(command);
+                        paranoid_free(command);
+                        log_msg(4, "Number of Software raid device: %s", tmp);
+                        c = atoi(tmp);
+                        mr_free(tmp);
+
+                        if (c) {
+                            /* This device is on our disk */
+                            if ((DSFptr = find_device_in_list(token)) == NULL) {
+                                log_msg (4, "Can't find device %s in mounted file systems list", token);
+                                mr_free(token);
+                                return (1);
+                            }
+                            DSFptr->check = 1;
+                        }
+                        mr_free(token);
+                    }
+                    mr_free(token);
+                    mr_free(mount_list);
+                } else {
+                    log_msg (4, "Error finding Volume Group for partition %s", partitions[i]);
+                    return (1);
+                }
+                continue;
+            }
+        } else {
+            log_msg (4, "Error finding partition type for the partition %s", partitions[i]);
+        }
+        paranoid_free(tmp);
+        /********
+         * It's not swap, mounted, or LVM. See if it's used in a software raid device.
+         ********/
+        log_msg (5, "It's not swap, mounted, or LVM. See if it's used in a software raid device.");
+        mr_asprintf(command, "mdadm --examine %s 2>/dev/null | awk '{if($1 == \"UUID\"){print $3}}'", partitions[i]);
+        log_msg(4, "  Running: %s", command);
+        tmp = call_program_and_get_last_line_of_output(command);
+        mr_free(command);
+
+        c = strlen(tmp);
+        mr_free(tmp);
+        if (!c) {
+            log_msg(4, "  Partition %s is not used in a non-LVM software raid device", partitions[i]);
+            continue;
+        }
+        log_msg (5, "  UUID: %s", tmp);
+        /* Get the Software raid device list */
+        mr_asprintf(command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
+        log_msg (5, "  Running: %s", command);
+        mount_list = call_program_and_get_last_line_of_output(command);
+        mr_free(command);
+
+        log_msg(4, "  Software raid device list: %s", mount_list);
+        /* Loop through the software raid device list to see if we can find the partition */
+        lastpos = 0;
+        while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
+            mr_asprintf(command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, tmp);
+            log_msg(4, "  Running: %s", command);
+            tmp = call_program_and_get_last_line_of_output(command);
+            mr_free(command);
+            c = atoi(tmp);
+            mr_free(tmp);
+
+            if (!c) {
+                log_msg (4,"  Didn't find partition %s in software raid device %s", partitions[i], token);
+            } else {
+                if ((DSFptr = find_device_in_list(token)) == NULL) {
+                    log_msg (4, "Can't find device %s in mounted file systems list", token);
+                    mr_free(token);
+                    return (1);
+                }
+                DSFptr->check = 1;
+                break;
+            }
+            mr_free(token);
+        }
+    }
+    mr_free(partition_list);
+    mr_free(mount_list);
+
+    /* Determine how much memory to allocate for included_dsf_list and excluded_dsf_list */
+    i = 0;
+    DSFptr= DSF_Head;
+    while (DSFptr != NULL) {
+        i += strlen(DSFptr->mount_point) + 1;
+        DSFptr = DSFptr->next;
+    }
+    log_msg (5, "i: %d", i);
+    if ((*included_dsf_list = (char *) calloc(i+100, sizeof(char))) == NULL) {
+        fatal_error ("Cannot allocate memory");
+    }
+    if ((*excluded_dsf_list = (char *) calloc(i+100, sizeof(char))) == NULL) {
+        fatal_error ("Cannot allocate memory");
+    }
+    DSFptr= DSF_Head;
+    while (DSFptr != NULL) {
+        if (DSFptr->check) {
+            log_msg (5, "%s is mounted on %s and is on disk %s\n", DSFptr->device, DSFptr->mount_point, dsf);
+            strcat(*included_dsf_list, DSFptr->mount_point);
+            strcat(*included_dsf_list, " ");
+        } else {
+            log_msg (4, "%s is mounted on %s and is NOT on disk %s\n", DSFptr->device, DSFptr->mount_point, dsf);
+            strcat(*excluded_dsf_list, DSFptr->mount_point);
+            strcat(*excluded_dsf_list, " ");
+        }
+        DSFptr = DSFptr->next;
+    }
+    log_msg (5, "included_dsf_list: %s", *included_dsf_list);
+    log_msg (5, "excluded_dsf_list: %s", *excluded_dsf_list);
+    return (0);
+}
+
+
+/* Update the bkpinfo structure for exclude & include paths 
+ * in order to handle correctly paths corresponding to devices */
+void mr_make_devlist_from_pathlist(char *pathlist, char mode) {
+
+char *token = NULL;
+int lastpos = 0;
+char *mounted_on_dsf = NULL;
+char *not_mounted_on_dsf = NULL;
+char token_chars[] =" \t\r\f\a\0";
+
+while ((token = mr_strtok(pathlist, token_chars, &lastpos)) != NULL) {
+    switch (get_dsf_mount_list(token, &mounted_on_dsf, &not_mounted_on_dsf)) {
+    case 1: 
+        if (mode == 'E') {
+            log_msg(1, "WARNING ! %s doesn't exist in -E option", token);
+        } else {
+            fatal_error("Error processing -I option");
+        }
+        break;
+    /* Everything is OK; proceed to archive data */
+    case 0:
+        if (mode == 'E') {
+            if (strlen(mounted_on_dsf)) {
+                log_to_screen("Excluding the following file systems on %s:\n", token);
+                log_to_screen("  %s\n", mounted_on_dsf);
+                log_msg (5, "Adding to bkpinfo->exclude_paths due to -E option: %s", mounted_on_dsf);
+                mr_strcat(bkpinfo->exclude_paths, "%s ", mounted_on_dsf);
+                mr_strcat(bkpinfo->exclude_devs, " %s ", token);
+            } else {
+                log_to_screen("Archiving only the following file systems on %s:\n", token);
+                log_to_screen("  %s\n", mounted_on_dsf);
+                mr_asprintf(bkpinfo->include_paths, "/");
+                if (strlen(not_mounted_on_dsf)) {
+                    log_msg (5, "Adding to bkpinfo->exclude_paths due to -I option: %s", not_mounted_on_dsf);
+                    log_to_screen("Not archiving the following file systems:\n");
+                    log_to_screen("  %s\n", not_mounted_on_dsf);
+                    mr_strcat(bkpinfo->exclude_paths, "%s ", not_mounted_on_dsf);
+                }
+            }
+        }
+        break;
+    /* It's a dsf but not a whole disk dsf */
+    case -2:
+        log_to_screen("Could %s be a partition instead of a whole disk device special file?\nIgnored.", token);
+        break;
+    /* A device special file was not passed in. Process it as a path. */
+    case -1:
+        if (mode == 'E') {
+            mr_strcat(bkpinfo->exclude_paths, "%s ", token);
+        } else {
+            mr_strcat(bkpinfo->include_paths, "%s ", token);
+        }
+        break;
+    }
+    mr_free(token);
+
+    if (bkpinfo->include_paths != NULL) {
+        mr_strip_spaces(bkpinfo->include_paths);
+        log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
+    }
+    if (bkpinfo->exclude_paths != NULL) {
+        mr_strip_spaces(bkpinfo->exclude_paths);
+        log_msg(1, "exclude_paths is now '%s'", bkpinfo->exclude_paths);
+    }
+    if (bkpinfo->exclude_devs != NULL) {
+        mr_strip_spaces(bkpinfo->exclude_devs);
+        log_msg(1, "exclude_devs is now '%s'", bkpinfo->exclude_devs);
+    }
+}
+}
+
+
+
+/**
+ * Ask user for details of backup/restore information.
+ * Called when @c mondoarchive doesn't get any parameters.
+ * @param bkpinfo The backup information structure to fill out with the user's data.
+ * @param archiving_to_media TRUE if archiving, FALSE if restoring.
+ * @return 0, always.
+ * @bug No point of `int' return value.
+ * @ingroup archiveGroup
+ */
+int interactively_obtain_media_parameters_from_user(bool archiving_to_media)
+// archiving_to_media is TRUE if I'm being called by mondoarchive
+// archiving_to_media is FALSE if I'm being called by mondorestore
+{
+    char *tmp = NULL;
+    char *p = NULL;
+    char *mds = NULL;
+    char *sz_size = NULL;
+    char *command = NULL;
+    char *comment = NULL;
+    int i;
+    FILE *fin;
+
+    assert(bkpinfo != NULL);
+    bkpinfo->nonbootable_backup = FALSE;
+
+    // Tape, CD, NETFS, ...?
+    srandom(getpid());
+    bkpinfo->backup_media_type =
+        (g_restoring_live_from_cd) ? cdr :
+        which_backup_media_type(bkpinfo->restore_data);
+    if (bkpinfo->backup_media_type == none) {
+        log_to_screen("User has chosen not to backup the PC");
+        finish(1);
+    }
+    /* Why asking to remove the media with tape ?
+    if (bkpinfo->backup_media_type == tape && bkpinfo->restore_data) {
+        popup_and_OK("Please remove media from drive(s)");
+    }
+    */
+    tmp = bkptype_to_string(bkpinfo->backup_media_type);
+    log_msg(3, "media type = %s", tmp);
+    mr_free(tmp);
+
+    bkpinfo->cdrw_speed = (bkpinfo->backup_media_type == cdstream) ? 2 : 4;
+    bkpinfo->compression_level = (bkpinfo->backup_media_type == cdstream) ? 1 : 5;
+    bkpinfo->use_lzo = (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
+    mvaddstr_and_log_it(2, 0, " ");
+
+    // Find device's /dev (or SCSI) entry
+    switch (bkpinfo->backup_media_type) {
+    case cdr:
+    case cdrw:
+    case dvd:
+    case usb:
+        /* Never try to eject a USB device */
+        if (bkpinfo->backup_media_type == usb) {
+            bkpinfo->please_dont_eject = TRUE;
+        }
+        if (archiving_to_media) {
+            if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
+                if (ask_me_yes_or_no("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")) {
+                    bkpinfo->manual_cd_tray = TRUE;
+                }
+            }
+            if ((bkpinfo->compression_level = which_compression_level()) == -1) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
+            }
+            mds = media_descriptor_string(bkpinfo->backup_media_type);
+            mr_asprintf(comment, "What speed is your %s (re)writer?", mds);
+            mr_free(bkpinfo->media_device);
+            if (bkpinfo->backup_media_type == dvd) {
+                bkpinfo->media_device = find_dvd_device();
+                mr_asprintf(tmp, "1");
+                mr_asprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
+                log_msg(1, "Setting to DVD defaults");
+            } else {
+                mr_asprintf(bkpinfo->media_device, "%s", VANILLA_SCSI_CDROM);
+                mr_asprintf(tmp, "4");
+                mr_asprintf(sz_size, "%d", 650);
+                log_msg(1, "Setting to CD defaults");
+            }
+            if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
+                p = popup_and_get_string("Speed", comment, tmp);
+                mr_free(tmp);
+
+                if (p == NULL) {
+                    log_to_screen("User has chosen not to backup the PC");
+                    mr_free(comment);
+                    finish(1);
+                }
+                /* tmp now has the new value given by the user */
+                tmp = p;
+            }
+            mr_free(comment);
+
+            bkpinfo->cdrw_speed = atoi(tmp);    // if DVD then this shouldn't ever be used anyway :)
+            mr_free(tmp);
+
+            mr_asprintf(comment, "How much data (in Megabytes) will each %s store?", mds);
+            mr_free(mds);
+            p = popup_and_get_string("Size", comment, sz_size);
+            mr_free(sz_size);
+            mr_free(comment);
+
+            if (p == NULL) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
+            }
+            sz_size = p;
+
+            for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
+                bkpinfo->media_size[i] = atoi(sz_size);
+            }
+
+            if (bkpinfo->media_size[0] <= 0) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
+            }
+        }
+        /* No break because we continue even for usb */
+    case cdstream:
+        mds = media_descriptor_string(bkpinfo->backup_media_type);
+
+        mr_free(bkpinfo->media_device);
+        if ((bkpinfo->disaster_recovery) && (bkpinfo->backup_media_type != usb)) {
+            mr_asprintf(bkpinfo->media_device, "/dev/cdrom");
+            log_msg(2, "CD-ROM device assumed to be at %s", bkpinfo->media_device);
+        } else if ((bkpinfo->restore_data && (bkpinfo->backup_media_type != usb)) || bkpinfo->backup_media_type == dvd) {
+            if ((bkpinfo->backup_media_type == dvd) || ((bkpinfo->media_device = find_cdrom_device(FALSE)) != NULL)) {
+                mr_asprintf(comment, "Please specify your %s drive's /dev entry", mds);
+                p = popup_and_get_string("Device?", comment, bkpinfo->media_device);
+                mr_free(comment);
+
+                if (p == NULL) {
+                    log_to_screen("User has chosen not to backup the PC");
+                    finish(1);
+                }
+                mr_free(bkpinfo->media_device);
+                bkpinfo->media_device = p;
+            }
+            if (bkpinfo->media_device != NULL) {
+                log_msg(2, "%s device found at %s", mds, bkpinfo->media_device);
+            } else {
+                log_msg(2, "%s device not found (bkpinfo->media_device is NULL)", mds);
+            }
+        } else {
+            if (((bkpinfo->media_device = find_cdrw_device()) != NULL) && (bkpinfo->backup_media_type != usb)) {
+                mr_free(bkpinfo->media_device);
+            }
+            if (bkpinfo->media_device != NULL) {
+                if (bkpinfo->backup_media_type == usb) {
+                    mr_asprintf(tmp, "I think your %s media corresponds to %s. Is this correct?", mds, bkpinfo->media_device);
+                } else {
+                    mr_asprintf(tmp, "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)", mds, bkpinfo->media_device);
+                }
+                if (!ask_me_yes_or_no(tmp)) {
+                    mr_free(bkpinfo->media_device);
+                }
+                mr_free(tmp);
+            }
+            if (!bkpinfo->media_device) {
+                if (bkpinfo->backup_media_type == usb) {
+                    p = popup_and_get_string("/dev entry?", "What is the /dev entry of your USB Disk/Key, please?", NULL);
+                } else {
+                    if (g_kernel_version < 2.6) {
+                        p = popup_and_get_string("Device node?", "What is the SCSI node of your CD (re)writer, please?", NULL);
+                    } else {
+                        p = popup_and_get_string("/dev entry?", "What is the /dev entry of your CD (re)writer, please?", NULL);
+                    }
+                }
+                if (p == NULL) {
+                    log_to_screen("User has chosen not to backup the PC");
+                    finish(1);
+                }
+                bkpinfo->media_device = p;
+            }
+        }
+        mr_free(mds);
+
+        if (bkpinfo->backup_media_type == cdstream) {
+            for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
+                bkpinfo->media_size[i] = 650;
+            }
+        }
+        break;
+    case udev:
+        if (!ask_me_yes_or_no
+            ("This option is for advanced users only. Are you sure?")) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+    case tape:
+
+        mr_free(bkpinfo->media_device);
+        if ((!bkpinfo->restore_mode) && ((bkpinfo->media_device = mr_find_tape_device()) == NULL)) {
+            log_msg(3, "Ok, using vanilla scsi tape.");
+            mr_asprintf(bkpinfo->media_device, "%s", VANILLA_SCSI_TAPE);
+            if ((fin = fopen(bkpinfo->media_device, "r"))) {
+                paranoid_fclose(fin);
+            } else {
+                mr_free(bkpinfo->media_device);
+                mr_asprintf(bkpinfo->media_device, "/dev/osst0");
+            }
+        }
+        if (bkpinfo->media_device != NULL) {
+            if ((fin = fopen(bkpinfo->media_device, "r"))) {
+                paranoid_fclose(fin);
+            } else {
+                if (does_file_exist("/tmp/mondo-restore.cfg")) {
+                    mr_free(bkpinfo->media_device);
+                    bkpinfo->media_device = read_cfg_var("/tmp/mondo-restore.cfg", "media-dev");
+                }
+            }
+        }
+        if (bkpinfo->media_device != NULL) {
+            mr_asprintf(tmp, "I think I've found your tape streamer at %s; am I right on the money?", bkpinfo->media_device);
+            if (!ask_me_yes_or_no(tmp)) {
+                mr_free(bkpinfo->media_device);
+            }
+            mr_free(tmp);
+        }
+        if (bkpinfo->media_device == NULL) {
+            p = popup_and_get_string("Device name?", "What is the /dev entry of your tape streamer?", bkpinfo->media_device);
+            if (p == NULL) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
+            }
+            bkpinfo->media_device = p;
+        }
+        mr_asprintf(tmp, "ls -l %s", bkpinfo->media_device);
+        if (run_program_and_log_output(tmp, FALSE)) {
+            log_to_screen("User has not specified a valid /dev entry");
+            finish(1);
+        }
+        mr_free(tmp);
+
+        bkpinfo->use_obdr = ask_me_yes_or_no("Do you want to activate OBDR support for your tapes ?");
+        bkpinfo->media_size[0] = 0;
+        log_msg(4, "media_size[0] = %ld", bkpinfo->media_size[0]);
+        if (bkpinfo->media_size[0] <= 0) {
+            bkpinfo->media_size[0] = 0;
+        }
+        for (i = 1; i <= MAX_NOOF_MEDIA; i++) {
+            bkpinfo->media_size[i] = bkpinfo->media_size[0];
+        }
+        if (archiving_to_media) {
+            if ((bkpinfo->compression_level =
+                 which_compression_level()) == -1) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
+            }
+        }
+        break;
+
+
+
+    case netfs:
+        /* Never try to eject a NETFS device */
+        bkpinfo->please_dont_eject = TRUE;
+
+        /* Initiate bkpinfo netfs_mount path from running environment if not already done */
+        if (bkpinfo->netfs_mount == NULL) {
+            bkpinfo->netfs_mount = call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1");
+        }
+#ifdef __FreeBSD__
+        if (TRUE)
+#else
+        if (!bkpinfo->disaster_recovery)
+#endif
+        {
+            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->netfs_mount);
+            bkpinfo->netfs_mount = p;
+            if (!bkpinfo->restore_data) {
+                if ((bkpinfo->compression_level =
+                     which_compression_level()) == -1) {
+                    log_to_screen("User has chosen not to backup the PC");
+                    finish(1);
+                }
+            }
+            // check whether already mounted - we better remove
+            // surrounding spaces and trailing '/' for this
+            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);
+            bkpinfo->isodir = call_program_and_get_last_line_of_output(command);
+            mr_free(command);
+
+            if (!bkpinfo->restore_data) {
+                mr_asprintf(comment, "How much data (in Megabytes) will each media store?");
+                // BERLIOS: 4480 shouldn't be hardcoded here
+                sz_size = popup_and_get_string("Size", comment, "4480");
+                mr_free(comment);
+                if (sz_size == NULL) {
+                    log_to_screen("User has chosen not to backup the PC");
+                    finish(1);
+                }
+            } else {
+                mr_asprintf(sz_size, "0");
+            }
+            for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
+                bkpinfo->media_size[i] = atoi(sz_size);
+            }
+            mr_free(sz_size);
+            if (bkpinfo->media_size[0] < 0) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
+            }
+        }
+        if (bkpinfo->disaster_recovery) {
+            mr_asprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
+            (void)system(command);
+            mr_free(command);
+
+            p = popup_and_get_string("Network protocol", "Which Network protocol should I use?", bkpinfo->netfs_proto);
+            if (p == NULL) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
+            }
+            mr_free(bkpinfo->netfs_proto);
+            bkpinfo->netfs_proto = p;
+
+            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->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->netfs_mount)) {
+            bkpinfo->isodir = call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f3 | head -n1");
+
+        } else {
+            mr_asprintf(bkpinfo->isodir, "%s/netfsdir", bkpinfo->tmpdir);
+            mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
+            run_program_and_log_output(command, 5);
+            mr_free(command);
+
+            if (bkpinfo->restore_data) {
+                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 {
+                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);
+            mr_free(tmp);
+
+            malloc_string(g_selfmounted_isodir);
+            strcpy(g_selfmounted_isodir, bkpinfo->isodir);
+        }
+        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->netfs_remote_dir);
+        if (p == NULL) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+        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->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);
+        if (p == NULL) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+        mr_free(bkpinfo->prefix);
+        bkpinfo->prefix = p;
+        log_msg(3, "prefix set to %s", bkpinfo->prefix);
+
+        log_msg(3, "Just set netfs_remote_dir to %s", bkpinfo->netfs_remote_dir);
+        log_msg(3, "isodir is still %s", bkpinfo->isodir);
+        break;
+
+    case iso:
+        if (!bkpinfo->disaster_recovery) {
+            p = popup_and_get_string("Storage dir.", "Please enter the full path name to the directory for your ISO images.  Example: /mnt/raid0_0", bkpinfo->isodir);
+            if (p == NULL) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
+            }
+            bkpinfo->isodir = p;
+
+            if (archiving_to_media) {
+                if ((bkpinfo->compression_level =
+                     which_compression_level()) == -1) {
+                    log_to_screen("User has chosen not to backup the PC");
+                    finish(1);
+                }
+                p = popup_and_get_string("ISO size.", "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s or DVD's you plan to backup to.", sz_size);
+                if (p == NULL) {
+                    log_to_screen("User has chosen not to backup the PC");
+                    finish(1);
+                }
+                for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
+                    bkpinfo->media_size[i] = atoi(p);
+                }
+                mr_free(p);
+            } else {
+                for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
+                    bkpinfo->media_size[i] = 650;
+                }
+            }
+        }
+        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);
+        if (p == NULL) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+        mr_free(bkpinfo->prefix);
+        bkpinfo->prefix = p;
+        log_msg(3, "prefix set to %s", bkpinfo->prefix);
+        break;
+
+    default:
+        fatal_error
+            ("I, Mojo Jojo, shall defeat those pesky Powerpuff Girls!");
+    }
+
+    if (archiving_to_media) {
+
+        mr_free(bkpinfo->boot_device);
+#ifdef __FreeBSD__
+#define EXAMPLEBD   "/dev/ad0"
+        bkpinfo->boot_device = call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'");
+#else
+#define EXAMPLEBD   "/dev/hda"
+        bkpinfo->boot_device = call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'");
+#endif
+        i = which_boot_loader(bkpinfo->boot_device);
+        if (i == 'U')           // unknown
+        {
+
+            p = popup_and_get_string("Boot device", "What is your boot device? (e.g. "EXAMPLEBD")", bkpinfo->boot_device);
+#undef EXAMPLEBD
+            if (p == NULL) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
+            }
+            mr_free(bkpinfo->boot_device);
+            bkpinfo->boot_device = p;
+#ifdef __FreeBSD__
+            i = which_boot_loader(bkpinfo->boot_device);
+#else
+            if (does_string_exist_in_boot_block(bkpinfo->boot_device, "LILO")) {
+                i = 'L';
+            } else
+                if (does_string_exist_in_boot_block(bkpinfo->boot_device, "ELILO")) {
+                i = 'E';
+            } else
+                if (does_string_exist_in_boot_block(bkpinfo->boot_device, "GRUB")) {
+                i = 'G';
+            } else {
+                i = 'U';
+            }
+#endif
+            if (i == 'U') {
+                if (ask_me_yes_or_no("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?")) {
+                    i = 'R';    // raw
+                } else {
+                    log_to_screen("I cannot find your boot loader. Please run mondoarchive with parameters.");
+                    finish(1);
+                }
+            }
+        }
+        bkpinfo->boot_loader = i;
+        mr_free(bkpinfo->include_paths);
+        mr_asprintf(p, "/");
+        bkpinfo->include_paths = p;
+
+        p = popup_and_get_string("Backup paths", "Please enter paths which you want me to backup. The default is '/' (i.e. everything).", bkpinfo->include_paths);
+        if (p == NULL) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+        mr_free(bkpinfo->include_paths);
+        bkpinfo->include_paths = p;
+
+        mr_asprintf(tmp, "%s", list_of_NETFS_mounts_only());
+        if (strlen(tmp) > 2) {
+            mr_strcat(bkpinfo->exclude_paths, " %s",tmp);
+        }
+        mr_free(tmp);
+// NTFS 
+        tmp = call_program_and_get_last_line_of_output("parted2fdisk -l | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'");
+        if (strlen(tmp) > 2) {
+            p = popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp);
+
+            if (p == NULL) {
+                log_to_screen("User has chosen not to backup the PC");
+                finish(1);
+            }
+            mr_free(bkpinfo->image_devs);
+            bkpinfo->image_devs = p;
+        }
+
+
+        p = popup_and_get_string("Exclude paths", "Please enter paths which you do NOT want to backup. Separate them with spaces. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.", bkpinfo->exclude_paths);
+        if (p == NULL) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+        mr_free(bkpinfo->exclude_paths);
+        bkpinfo->exclude_paths = p;
+
+        p = popup_and_get_string("Temporary directory", "Please enter your temporary directory.", bkpinfo->tmpdir);
+        if (p == NULL) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+        mr_free(bkpinfo->tmpdir);
+        bkpinfo->tmpdir = p;
+
+        p = popup_and_get_string("Scratch directory", "Please enter your scratch directory.", bkpinfo->scratchdir);
+        if (p == NULL) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+        mr_free(bkpinfo->scratchdir);
+        bkpinfo->scratchdir = p;
+
+// Interactive mode:
+#ifdef __IA64__
+        bkpinfo->make_cd_use_lilo = TRUE;
+#else
+        bkpinfo->make_cd_use_lilo = FALSE;
+#endif
+        bkpinfo->backup_data = TRUE;
+        bkpinfo->verify_data =
+            ask_me_yes_or_no
+            ("Will you want to verify your backups after Mondo has created them?");
+
+#ifndef __FreeBSD__
+        if (!ask_me_yes_or_no
+            ("Are you confident that your kernel is a sane, sensible, standard Linux kernel? Say 'no' if you are using a Gentoo <1.4 or Debian <3.0, please."))
+#endif
+        {
+            mr_free(bkpinfo->kernel_path);
+            mr_asprintf(bkpinfo->kernel_path, "FAILSAFE");
+        }
+
+        if (!ask_me_yes_or_no
+            ("Are you sure you want to proceed? Hit 'no' to abort.")) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+    } else {
+        bkpinfo->restore_data = TRUE;   // probably...
+    }
+
+    if (bkpinfo->backup_media_type == iso
+        || bkpinfo->backup_media_type == netfs) {
+        g_ISO_restore_mode = TRUE;
+    }
+#ifdef __FreeSD__
+// skip
+#else
+    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->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
+
+    log_it("media device = %s", bkpinfo->media_device);
+    log_it("media size = %ld", bkpinfo->media_size[1]);
+    tmp = bkptype_to_string(bkpinfo->backup_media_type);
+    log_it("media type = %s", tmp);
+    mr_free(tmp);
+
+    if (bkpinfo->prefix) {
+        log_it("prefix = %s", bkpinfo->prefix);
+    }
+    log_it("compression = %ld", bkpinfo->compression_level);
+
+    /* Handle devices passed in bkpinfo and print result */
+    mr_make_devlist_from_pathlist(bkpinfo->exclude_paths, 'E');
+    mr_make_devlist_from_pathlist(bkpinfo->include_paths, 'I');
+
+    log_it("scratchdir = '%s'", bkpinfo->scratchdir);
+    log_it("tmpdir = '%s'", bkpinfo->tmpdir);
+    if (bkpinfo->image_devs) {
+        log_it("image_devs = '%s'", bkpinfo->image_devs);
+    }
+    log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device, bkpinfo->boot_loader);
+    if (bkpinfo->media_size[0] < 0) {
+        if (archiving_to_media) {
+            fatal_error("Media size is less than zero.");
+        } else {
+            log_msg(2, "Warning - media size is less than zero.");
+            bkpinfo->media_size[0] = 0;
+        }
+    }
+    paranoid_free(sz_size);
+    return (0);
+}
+
+
+
+
 /* @} - end of deviceGroup */

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

@@ -777 +777 @@
     mr_free(bkpinfo->include_paths);
     mr_free(bkpinfo->exclude_paths);
+    mr_free(bkpinfo->exclude_devs);
     mr_free(bkpinfo->restore_path);
     mr_free(bkpinfo->call_before_iso);
@@ -840 +841 @@
     bkpinfo->include_paths = NULL;
     bkpinfo->exclude_paths = NULL;
+    bkpinfo->exclude_devs = NULL;
     bkpinfo->restore_path = NULL;
     bkpinfo->call_before_iso = NULL;

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

@@ -521 +521 @@
    */
     char *exclude_paths;
+
+  /**
+   * Devices to NOT back up.
+   * Multiple devices should be separated by spaces.
+   */
+    char *exclude_devs;
 
   /**