Changeset 3878 in MondoRescue for branches/3.3/mondo/src/common/libmondo-devices.c

Timestamp:

Mar 8, 2024, 12:15:10 PM (4 months ago)

Author:

Bruno Cornec

Message:

Fix compiler errors

File:

• branches/3.3/mondo/src/common/libmondo-devices.c (modified) (10 diffs)

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

@@ -55 +55 @@
 extern char *call_program_and_get_last_line_of_output(const char *);
 
-static char g_cd_drive_is_here[MAX_STR_LEN / 4] = "";
-static char g_cdrom_drive_is_here[MAX_STR_LEN / 4] = "";
-static char g_dvd_drive_is_here[MAX_STR_LEN / 4] = "";
-
-
 /**
  * ????? @bug ?????
@@ -84 +79 @@
 
 
-void set_g_cdrom_and_g_dvd_to_bkpinfo_value()
-{
-    strcpy(g_cdrom_drive_is_here, bkpinfo->media_device);   // just in case
-    strcpy(g_dvd_drive_is_here, bkpinfo->media_device); // just in case
-}
-
-
-
 /**
  * Retract all CD trays and wait for autorun to complete.
@@ -98 +85 @@
 void retract_CD_tray_and_defeat_autorun(void)
 {
-//  log_it("rctada: Retracting all CD trays", __LINE__);
+//  log_it("rctada: Retracting optical tray", __LINE__);
     if (!bkpinfo->please_dont_eject) {
-        if (strlen(g_cdrom_drive_is_here) > 0) {
-            inject_device(g_cdrom_drive_is_here);
-        }
-        if (strlen(g_dvd_drive_is_here) > 0) {
-            inject_device(g_dvd_drive_is_here);
-        }
-    }
-//  log_it("rctada: killing autorun");
-//  run_program_and_log_output("killall autorun", TRUE);
+        if (bkpinfo->media_device != NULL) {
+            inject_device(bkpinfo->media_device);
+    }
     if (!run_program_and_log_output("ps | grep autorun | grep -v grep", 5)) {
         log_it("autorun detected; sleeping for 2 seconds");
         sleep(2);
     }
-    log_it("rctada: Unmounting all CD drives", __LINE__);
-    run_program_and_log_output("umount /dev/cdr* /dev/dvd*", 5);
+}
+
+
+
+/**
+ * Find out what device is mounted as root (/).
+ * @return Root device.
+ * @note The returned string points to storage that needs to be freed by
+ * caller
+ * @bug A bit of a misnomer; it's actually finding out the root device.
+ * The mountpoint (where it's mounted) will obviously be '/'.
+ */
+char *where_is_root_mounted(void) {
+
+/*@ buffers **************** */
+char *tmp = NULL;
+
+#ifdef __FreeBSD__
+    tmp = call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1");
+#else
+    tmp = call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1 | sed s/[0-9]// | sed s/[0-9]//");
+    if (strstr(tmp, "/dev/cciss/")) {
+        mr_free(tmp);
+        tmp = call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1 | cut -dp -f1");
+    }
+    if (strstr(tmp, "/dev/md")) {
+        mr_free(tmp);
+        tmp = call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1");
+    }
+#endif
+
+return (tmp);
 }
 
@@ -447 +458 @@
 
 
-/**
- * Try to mount CD/DVD at @p mountpoint. If the CD/DVD is not found or has
- * not been specified, call find_optical_device() to find it.
- * @param mountpoint Where to mount the CD-ROM.
- * @return TRUE for success, FALSE for failure.
- * @see mount_media
- */
-bool find_and_mount_actual_cd(char *mountpoint) {
-
-    /*@ buffers ***************************************************** */
-
-    /*@ int's  ****************************************************** */
-    bool res;
-
-    /*@ end vars **************************************************** */
-
-    assert(bkpinfo != NULL);
-    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
-
-    if (bkpinfo->media_device == NULL) {
-        bkpinfo->media_device = find_optical_device();
-    }
-
-    if (bkpinfo->backup_media_type != iso) {
-        retract_CD_tray_and_defeat_autorun();
-    }
-
-    if ((bkpinfo->media_device == NULL) || (res = mount_media(mountpoint))) {
-        mr_free(bkpinfo->media_device);
-        if ((bkpinfo->media_device = mr_popup_and_get_string("CD-ROM device", "Please enter your CD-ROM's /dev device", "/dev/cdrom")) == NULL) {
-            res = TRUE;
-        } else {
-            res = mount_media(mountpoint);
-        }
-    }
-    if (res) {
-        log_msg(1, "mount failed");
-    } else {
-        log_msg(1, "mount succeeded with %s", bkpinfo->media_device);
-    }
-    return (res);
-}
-/* 
- * This function tries to find a USB media device
- * and return it's device file to the caller that needs to free it
- */
-char *find_usb_device(void)
-{
-    char *dev = NULL;
-    char *tmp1 = NULL;
-    char *command = NULL;
-
-    log_to_screen("I am looking for your USB key. Please wait.");
-
-    if (bkpinfo->media_device != NULL) {
-        log_msg(3, "Been there, done that. Returning %s", bkpinfo->media_device);
-        return (bkpinfo->media_device);
-    }
-
-    tmp1 = find_home_of_exe("lsscsi");
-    if (tmp1 != NULL) {
-        mr_asprintf(command, "%s | grep ' disk' | grep USB | awk '{print $NF}' | head -1", tmp1);
-        dev = call_program_and_get_last_line_of_output(command);
-        mr_free(command);
-    }
-    mr_free(tmp1);
-
-    if ((dev == NULL) || !does_file_exist(dev)) {
-        tmp1 = find_home_of_exe("lsblk");
-        if (tmp1 != NULL) {
-            mr_asprintf(command, "%s --noheadings --raw --output rm,tran,type,path --sort path | awk '/^1 usb disk/ {d=$4} END {print d}'", tmp1);
-            dev = call_program_and_get_last_line_of_output(command);
-            mr_free(command);
-        }
-        mr_free(tmp1);
-        log_it("Unable to find a tape device on this system");
-    }
-    if (dev != NULL) {
-        log_it("find_usb_device found %s manually", dev);
-    }
-
-    if ((dev != NULL) && does_file_exist(dev)) {
-        log_it("find_usb_device returns %s", dev);
-    } else {
-        mr_free(dev);
-        log_it("find_usb_device found no USB key on your system returning NULL");
-    }
-    return(dev);
-}
-
-
 /* 
  * This function tries to find an optical media device
  * and return it's device file to the caller that needs to free it
  */
-char *find_optical_device(void)
-{
+char *find_optical_device(void) {
     char *dev = NULL;
     char *tmp1 = NULL;
@@ -582 +501 @@
                         if (!does_file_exist(dev)) {
                             log_it("Unable to find a tape device on this system");
+                        }
+                    }
                 }
             }
@@ -598 +519 @@
     return(dev);
 }
+/**
+* Mount the CD-ROM or USB device at /mnt/cdrom.
+* @param bkpinfo The backup information structure. Fields used: 
+* - @c bkpinfo->backup_media_type
+* - @c bkpinfo->disaster_recovery
+* - @c bkpinfo->isodir
+* - @c bkpinfo->media_device
+* @return TRUE for success, FALSE for failure.
+*/
+bool mount_media(const char *mountpoint) {
+
+    char *mount_cmd = NULL;
+    char *mountdir = NULL;
+    char *tmp = NULL;
+    int i = 0, res = 0;
+#ifdef __FreeBSD__
+    char mdd[32];
+    char *mddev = mdd;
+    char *dev;
+#endif
+
+    if (bkpinfo->backup_media_type == tape || bkpinfo->backup_media_type == udev) {
+        log_msg(8, "Tape/udev. Therefore, no need to mount a media.");
+        return(TRUE);
+    }
+
+    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
+
+    mr_asprintf(tmp, "mount | grep -F %s", mountpoint);
+    if (!run_program_and_log_output(tmp, FALSE)) {
+        log_msg(2, "mount_media() - media already mounted. Fair enough.");
+        mr_free(tmp);
+        return (TRUE);
+    }
+    mr_free(tmp);
+
+    make_hole_for_dir(mountpoint);
+
+    if (bkpinfo->backup_media_type == netfs) {
+        log_msg(2, "Mounting for Network thingy");
+        log_msg(2, "isodir = %s", bkpinfo->isodir);
+        if (((bkpinfo->isodir == NULL) || !strcmp(bkpinfo->isodir, "/")) && am_I_in_disaster_recovery_mode()) {
+            mr_asprintf(bkpinfo->isodir, "%s", "/tmp/isodir");
+            log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
+        }
+#ifdef __FreeBSD__
+        if (bkpinfo->netfs_remote_dir != NULL) {
+            // NETFS
+            mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+        } else {
+            // ISO
+            mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
+        }
+        mddev = make_vn(mount_cmd);
+        mr_free(mount_cmd);
+
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, mountpoint);
+#else
+        if (bkpinfo->netfs_remote_dir != NULL) {
+            // NETFS
+            mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number, mountpoint);
+        } else {
+            // ISO
+            mr_asprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, mountpoint);
+        }
+#endif
+
+    } else if (bkpinfo->backup_media_type == iso) {
+        if (bkpinfo->subdir) {
+            mr_asprintf(mountdir, "%s/%s", bkpinfo->isodir, bkpinfo->subdir);
+        } else {
+            mr_asprintf(mountdir, "%s", bkpinfo->isodir);
+        }
+#ifdef __FreeBSD__
+        mr_asprintf(mount_cmd, "%s/%s-%d.iso", mountdir, bkpinfo->prefix, g_current_media_number);
+        mddev = make_vn(mount_cmd);
+        mr_free(mount_cmd);
+
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, mountpoint);
+#else
+        mr_asprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", mountdir, bkpinfo->prefix, g_current_media_number, mountpoint);
+#endif
+        mr_free(mountdir);
+    } else if (bkpinfo->backup_media_type == usb) {
+        mr_asprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, mountpoint);
+    } else {    //  optical
+        if (bkpinfo->disaster_recovery
+            && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
+            mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
+        } else {
+            if (bkpinfo->media_device == NULL) {
+                bkpinfo->media_device = find_optical_device();
+            }
+        }
+
+#ifdef __FreeBSD__
+        if (g_ISO_restore_mode) {
+            mr_asprintf(dev, "%s", make_vn(bkpinfo->media_device));
+            if (!dev) {
+                mr_asprintf(command, "Unable to mount ISO (make_vn(%s) failed)", bkpinfo->media_device);
+                fatal_error(command);
+            }
+            mr_free(bkpinfo->media_device);
+            bkpinfo->media_device = dev
+        }
+
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s 2>> %s", bkpinfo->media_device, mountpoint, MONDO_LOGFILE);
+#else
+        mr_asprintf(mount_cmd, "mount %s -o loop,ro -t iso9660 %s 2>> %s", bkpinfo->media_device, mountpoint, MONDO_LOGFILE);
+#endif
+        log_msg(2, "(mount_media) --- command = %s", mount_cmd);
+        // usefull ??
+        if (strncmp(bkpinfo->media_device, "/dev/", 5) == 0) {
+            retract_CD_tray_and_defeat_autorun();
+        }
+    }
+
+    for (i = 0; i < 2; i++) {
+        res = run_program_and_log_output(mount_cmd, FALSE);
+        if (!res) {
+            break;
+        } else {
+            log_msg(2, "Failed to mount device.");
+            sleep(5);
+            sync();
+        }
+    }
+    mr_free(mount_cmd);
+
+    if (res) {
+        log_msg(2, "Failed, despite %d attempts", i);
+        return(FALSE);
+    } else {
+        log_msg(2, "Mounted media drive OK");
+        return(TRUE);
+    }
+}
+/**************************************************************************
+*END_MOUNT_MEDIA                                                         *
+**************************************************************************/
+
+
+
+
+/**
+ * Try to mount CD/DVD at @p mountpoint. If the CD/DVD is not found or has
+ * not been specified, call find_optical_device() to find it.
+ * @param mountpoint Where to mount the CD-ROM.
+ * @return TRUE for success, FALSE for failure.
+ * @see mount_media
+ */
+bool find_and_mount_actual_cd(char *mountpoint) {
+
+    /*@ buffers ***************************************************** */
+
+    /*@ int's  ****************************************************** */
+    bool res;
+
+    /*@ end vars **************************************************** */
+
+    assert(bkpinfo != NULL);
+    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
+
+    if (bkpinfo->media_device == NULL) {
+        bkpinfo->media_device = find_optical_device();
+    }
+
+    if (bkpinfo->backup_media_type != iso) {
+        retract_CD_tray_and_defeat_autorun();
+    }
+
+    if ((bkpinfo->media_device == NULL) || (res = mount_media(mountpoint))) {
+        mr_free(bkpinfo->media_device);
+        if ((bkpinfo->media_device = mr_popup_and_get_string("CD-ROM device", "Please enter your CD-ROM's /dev device", "/dev/cdrom")) == NULL) {
+            res = TRUE;
+        } else {
+            res = mount_media(mountpoint);
+        }
+    }
+    if (res) {
+        log_msg(1, "mount failed");
+    } else {
+        log_msg(1, "mount succeeded with %s", bkpinfo->media_device);
+    }
+    return (res);
+}
+/* 
+ * This function tries to find a USB media device
+ * and return it's device file to the caller that needs to free it
+ */
+char *find_usb_device(void)
+{
+    char *dev = NULL;
+    char *tmp1 = NULL;
+    char *command = NULL;
+
+    log_to_screen("I am looking for your USB key. Please wait.");
+
+    if (bkpinfo->media_device != NULL) {
+        log_msg(3, "Been there, done that. Returning %s", bkpinfo->media_device);
+        return (bkpinfo->media_device);
+    }
+
+    tmp1 = find_home_of_exe("lsscsi");
+    if (tmp1 != NULL) {
+        mr_asprintf(command, "%s | grep ' disk' | grep USB | awk '{print $NF}' | head -1", tmp1);
+        dev = call_program_and_get_last_line_of_output(command);
+        mr_free(command);
+    }
+    mr_free(tmp1);
+
+    if ((dev == NULL) || !does_file_exist(dev)) {
+        tmp1 = find_home_of_exe("lsblk");
+        if (tmp1 != NULL) {
+            mr_asprintf(command, "%s --noheadings --raw --output rm,tran,type,path --sort path | awk '/^1 usb disk/ {d=$4} END {print d}'", tmp1);
+            dev = call_program_and_get_last_line_of_output(command);
+            mr_free(command);
+        }
+        mr_free(tmp1);
+        log_it("Unable to find a tape device on this system");
+    }
+    if (dev != NULL) {
+        log_it("find_usb_device found %s manually", dev);
+    }
+
+    if ((dev != NULL) && does_file_exist(dev)) {
+        log_it("find_usb_device returns %s", dev);
+    } else {
+        mr_free(dev);
+        log_it("find_usb_device found no USB key on your system returning NULL");
+    }
+    return(dev);
+}
+
+
 
 /* Generic fund to find a media 
@@ -971 +1127 @@
 
 /**
-* Mount the CD-ROM or USB device at /mnt/cdrom.
-* @param bkpinfo The backup information structure. Fields used: 
-* - @c bkpinfo->backup_media_type
-* - @c bkpinfo->disaster_recovery
-* - @c bkpinfo->isodir
-* - @c bkpinfo->media_device
-* @return TRUE for success, FALSE for failure.
-*/
-bool mount_media(const char *mountpoint) {
-
-    char *mount_cmd = NULL;
-    char *mountdir = NULL;
+ * Find out what number CD is in the drive.
+ * @param bkpinfo The backup information structure. The @c bkpinfo->media_device field is the only one used.
+ * @return The current CD number, or -1 if it could not be found.
+ * @note If the CD is not mounted, it will be mounted
+ * (and remain mounted after this function returns).
+ */
+int what_number_cd_is_this(void) {
+
+    int cd_number = -1;
+    char *mountdev = NULL;
     char *tmp = NULL;
-    int i = 0, res = 0;
-#ifdef __FreeBSD__
-    char mdd[32];
-    char *mddev = mdd;
-    char *dev;
-#endif
-
-    if (bkpinfo->backup_media_type == tape || bkpinfo->backup_media_type == udev) {
-        log_msg(8, "Tape/udev. Therefore, no need to mount a media.");
-        return(TRUE);
-    }
-
-    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
-
-    mr_asprintf(tmp, "mount | grep -F %s", mountpoint);
-    if (!run_program_and_log_output(tmp, FALSE)) {
-        log_msg(2, "mount_media() - media already mounted. Fair enough.");
+
+    assert(bkpinfo != NULL);
+//  log_it("Asking what_number_cd_is_this");
+    if ((g_ISO_restore_mode) || (g_restoring_live_from_cd)) {
+        tmp = call_program_and_get_last_line_of_output("mount | grep iso9660 | awk '{print $3;}'");
+        mr_asprintf(mountdev, "%s%s", tmp, "/archives/THIS-CD-NUMBER");
         mr_free(tmp);
-        return (TRUE);
-    }
-    mr_free(tmp);
-
-    make_hole_for_dir(mountpoint);
-
-    if (bkpinfo->backup_media_type == netfs) {
-        log_msg(2, "Mounting for Network thingy");
-        log_msg(2, "isodir = %s", bkpinfo->isodir);
-        if (((bkpinfo->isodir == NULL) || !strcmp(bkpinfo->isodir, "/")) && am_I_in_disaster_recovery_mode()) {
-            mr_asprintf(bkpinfo->isodir, "%s", "/tmp/isodir");
-            log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
-        }
-#ifdef __FreeBSD__
-        if (bkpinfo->netfs_remote_dir != NULL) {
-            // NETFS
-            mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
-        } else {
-            // ISO
-            mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
-        }
-        mddev = make_vn(mount_cmd);
-        mr_free(mount_cmd);
-
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, mountpoint);
-#else
-        if (bkpinfo->netfs_remote_dir != NULL) {
-            // NETFS
-            mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number, mountpoint);
-        } else {
-            // ISO
-            mr_asprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, mountpoint);
-        }
-#endif
-
-    } else if (bkpinfo->backup_media_type == iso) {
-        if (bkpinfo->subdir) {
-            mr_asprintf(mountdir, "%s/%s", bkpinfo->isodir, bkpinfo->subdir);
-        } else {
-            mr_asprintf(mountdir, "%s", bkpinfo->isodir);
-        }
-#ifdef __FreeBSD__
-        mr_asprintf(mount_cmd, "%s/%s-%d.iso", mountdir, bkpinfo->prefix, g_current_media_number);
-        mddev = make_vn(mount_cmd);
-        mr_free(mount_cmd);
-
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, mountpoint);
-#else
-        mr_asprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", mountdir, bkpinfo->prefix, g_current_media_number, mountpoint);
-#endif
-        mr_free(mountdir);
-    } else if (bkpinfo->backup_media_type == usb) {
-        mr_asprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, mountpoint);
-    } else {    //  optical
-        if (bkpinfo->disaster_recovery
-            && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-            mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
-        } else {
-            if (bkpinfo->media_device == NULL) {
-                bkpinfo->media_device = find_optical_device();
-            }
-        }
-
-#ifdef __FreeBSD__
-        if (g_ISO_restore_mode) {
-            mr_asprintf(dev, "%s", make_vn(bkpinfo->media_device));
-            if (!dev) {
-                mr_asprintf(command, "Unable to mount ISO (make_vn(%s) failed)", bkpinfo->media_device);
-                fatal_error(command);
-            }
-            mr_free(bkpinfo->media_device);
-            bkpinfo->media_device = dev
-        }
-
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s 2>> %s", bkpinfo->media_device, mountpoint, MONDO_LOGFILE);
-#else
-        mr_asprintf(mount_cmd, "mount %s -o loop,ro -t iso9660 %s 2>> %s", bkpinfo->media_device, mountpoint, MONDO_LOGFILE);
-#endif
-        log_msg(2, "(mount_media) --- command = %s", mount_cmd);
-        // usefull ??
-        if (strncmp(device, "/dev/", 5) == 0) {
-            retract_CD_tray_and_defeat_autorun();
-        }
-    }
-
-    for (i = 0; i < 2; i++) {
-        res = run_program_and_log_output(mount_cmd, FALSE);
-        if (!res) {
-            break;
-        } else {
-            log_msg(2, "Failed to mount device.");
-            sleep(5);
-            sync();
-        }
-    }
-    mr_free(mount_cmd);
-
-    if (res) {
-        log_msg(2, "Failed, despite %d attempts", i);
-        return(FALSE);
-    } else {
-        log_msg(2, "Mounted media drive OK");
-        return(TRUE);
-    }
-}
-/**************************************************************************
-*END_MOUNT_MEDIA                                                         *
-**************************************************************************/
+        cd_number = atoi(last_line_of_file(mountdev));
+        mr_free(mountdev);
+        return (cd_number);
+    }
+
+    if ((bkpinfo->media_device == NULL) || !does_file_exist(bkpinfo->media_device)) {
+        log_it("ERROR: bkpinfo->media_device shoulnd't be unaccessible here\n");
+        /* trying again ! */
+        bkpinfo->media_device = find_optical_device();
+    }
+    if ((bkpinfo->media_device == NULL) || !does_file_exist(bkpinfo->media_device)) {
+        fatal_error("ERROR: bkpinfo->media_device shoulnd't really be unaccessible here\n");
+    }
+    if (!is_this_device_mounted(MNT_CDROM)) {
+        mount_media(MNT_CDROM);
+    }
+
+    cd_number = atoi(last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER"));
+    return(cd_number);
+}
 
 
@@ -2000 +2055 @@
 
 /**
+ * Get a |-separated list of NETFS mounts.
+ * @return The list created.
+ * @note The return value points to allocated string that needs to be freed by
+ * caller
+ * @bug Even though we only want the mounts, the devices are still checked.
+ */
+char *list_of_NETFS_mounts_only(void)
+{
+    char *exclude_these_directories = NULL;
+
+    exclude_these_directories = call_program_and_get_last_line_of_output("mount -t coda,ncpfs,fuse.sshfs,nfs,nfs4,vmhgfs,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol,fuse.boostfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' '|' | awk '{print $0;}'");
+    log_msg(9,"list_of_NETFS_mounts_only returns %s",exclude_these_directories);
+    return(exclude_these_directories);
+}
+
+/* @} - end of utilityGroup */
+
+
+/**
  * Ask user for details of backup/restore information.
  * Called when @c mondoarchive doesn't get any parameters.
@@ -2717 +2791 @@
 
 
-/**
- * Get a |-separated list of NETFS mounts.
- * @return The list created.
- * @note The return value points to allocated string that needs to be freed by
- * caller
- * @bug Even though we only want the mounts, the devices are still checked.
- */
-char *list_of_NETFS_mounts_only(void)
-{
-    char *exclude_these_directories = NULL;
-
-    exclude_these_directories = call_program_and_get_last_line_of_output("mount -t coda,ncpfs,fuse.sshfs,nfs,nfs4,vmhgfs,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol,fuse.boostfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' '|' | awk '{print $0;}'");
-    log_msg(9,"list_of_NETFS_mounts_only returns %s",exclude_these_directories);
-    return(exclude_these_directories);
-}
-
-/* @} - end of utilityGroup */
-
-
 
 
@@ -2804 +2859 @@
     return(ret);
 }
-
-
-
-
-
-/**
- * Find out what number CD is in the drive.
- * @param bkpinfo The backup information structure. The @c bkpinfo->media_device field is the only one used.
- * @return The current CD number, or -1 if it could not be found.
- * @note If the CD is not mounted, it will be mounted
- * (and remain mounted after this function returns).
- */
-int what_number_cd_is_this(void) {
-
-    int cd_number = -1;
-    char *mountdev = NULL;
-    char *tmp = NULL;
-
-    assert(bkpinfo != NULL);
-//  log_it("Asking what_number_cd_is_this");
-    if ((g_ISO_restore_mode) || (g_restoring_live_from_cd)) {
-        tmp = call_program_and_get_last_line_of_output("mount | grep iso9660 | awk '{print $3;}'");
-        mr_asprintf(mountdev, "%s%s", tmp, "/archives/THIS-CD-NUMBER");
-        mr_free(tmp);
-        cd_number = atoi(last_line_of_file(mountdev));
-        mr_free(mountdev);
-        return (cd_number);
-    }
-
-    if ((bkpinfo->media_device == NULL) || !does_file_exist(bkpinfo->media_device)) {
-        log_it("ERROR: bkpinfo->media_device shoulnd't be unaccessible here\n");
-        /* trying again ! */
-        bkpinfo->media_device = find_optical_device();
-    }
-    if ((bkpinfo->media_device == NULL) || !does_file_exist(bkpinfo->media_device)) {
-        fatal_error("ERROR: bkpinfo->media_device shoulnd't really be unaccessible here\n");
-    }
-    if (!is_this_device_mounted(bkpinfo->media_device, MNT_CDROM)) {
-        mount_media(MNT_CDROM);
-    }
-
-    cd_number = atoi(last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER"));
-    return(cd_number);
-}
-
-
-/**
- * Find out what device is mounted as root (/).
- * @return Root device.
- * @note The returned string points to storage that needs to be freed by
- * caller
- * @bug A bit of a misnomer; it's actually finding out the root device.
- * The mountpoint (where it's mounted) will obviously be '/'.
- */
-char *where_is_root_mounted(void) {
-
-/*@ buffers **************** */
-char *tmp = NULL;
-
-#ifdef __FreeBSD__
-    tmp = call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1");
-#else
-    tmp = call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1 | sed s/[0-9]// | sed s/[0-9]//");
-    if (strstr(tmp, "/dev/cciss/")) {
-        mr_free(tmp);
-        tmp = call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1 | cut -dp -f1");
-    }
-    if (strstr(tmp, "/dev/md")) {
-        mr_free(tmp);
-        tmp = call_program_and_get_last_line_of_output("mount | grep \" on / \" | cut -d' ' -f1");
-    }
-#endif
-
-return (tmp);
-}
-