Changeset 1903 in MondoRescue for branches/stable/mondo/src/common

Timestamp:

Apr 10, 2008, 1:13:58 AM (16 years ago)

Author:

Bruno Cornec

Message:

merge -r 1842:1889 2.2.5

Location:

branches/stable/mondo/src/common

Files:

• libmondo-archive.c (modified) (5 diffs)
• libmondo-devices.c (modified) (4 diffs)
• libmondo-filelist.c (modified) (2 diffs)
• libmondo-stream.c (modified) (1 diff)
• libmondo-tools.c (modified) (1 diff)
• newt-specific.c (modified) (1 diff)

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

@@ -42 +42 @@
 #define DVDRWFORMAT 1
 
-#ifndef __FreeBSD__
 #ifndef _SEMUN_H
 #define _SEMUN_H
@@ -56 +55 @@
 };
 #endif
-#endif                          /* __FreeBSD__ */
 
 extern struct mr_ar_conf *mr_conf;
@@ -615 +613 @@
         }
 #else
+#ifdef __IA64__
+        strcpy(bootdev, call_program_and_get_last_line_of_output
+               ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+#else
         strcpy(bootdev, call_program_and_get_last_line_of_output
                ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+#endif
         if (strstr(bootdev, "/dev/cciss/")) {
+#ifdef __IA64__
+            strcpy(bootdev, call_program_and_get_last_line_of_output
+                   ("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
+#else
             strcpy(bootdev, call_program_and_get_last_line_of_output
                    ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
+#endif
         }
         if (!bootdev[0]) {
@@ -3192 +3200 @@
     /*@ bool ******************************************************** */
     bool that_one_was_ok;
-    bool using_nfs;
     bool orig_vfy_flag_val;
 
@@ -3204 +3211 @@
     }
 
-    if (strlen(bkpinfo->nfs_mount) > 1) {
-        using_nfs = TRUE;
-    } else {
-        using_nfs = FALSE;
-    }
     mr_msg(1, "OK, time to make %s #%d",
             bkpinfo->backup_media_string,

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

@@ -1576 +1576 @@
     }
     if (bkpinfo->backup_media_type == tape && bkpinfo->restore_data) {
-        popup_and_OK(_("Please remove CD from drive"));
+        popup_and_OK(_("Please remove media from drive"));
     }
     mr_msg(3, "media type = %s",
@@ -1804 +1804 @@
 
     case nfs:
+        /* Never try to eject a NFS device */
+        bkpinfo->please_dont_eject = TRUE;
+
+        /* Initiate bkpinfo nfs_mount path from running environment if not already done */
         if (!bkpinfo->nfs_mount[0]) {
             strcpy(bkpinfo->nfs_mount,
@@ -1840 +1844 @@
             mr_free(command);
 
-            mr_asprintf(&comment,
+            if (!bkpinfo->restore_data) {
+                mr_asprintf(&comment,
                     _("How much data (in Megabytes) will each media store?"));
-            if (!popup_and_get_string(_("Size"), comment, sz_size, 5)) {
-                log_to_screen(_("User has chosen not to backup the PC"));
-                finish(1);
+                if (!popup_and_get_string(_("Size"), comment, sz_size, 5)) {
+                    log_to_screen(_("User has chosen not to backup the PC"));
+                    finish(1);
+                }
+            } else {
+                sz_size = 0;
             }
             mr_free(comment);
@@ -1863 +1871 @@
             }
         }
-        if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
+        /* Initiate bkpinfo isodir path from running environment if mount already done */
+        if (is_this_device_mounted(bkpinfo->nfs_mount)) {
+            strcpy(bkpinfo->isodir,
+                   call_program_and_get_last_line_of_output
+                   ("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
+        } else {
             sprintf(bkpinfo->isodir, "%s/nfsdir", bkpinfo->tmpdir);
             mr_asprintf(&command, "mkdir -p %s", bkpinfo->isodir);

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

@@ -1527 +1527 @@
     time_t time_of_last_full_backup = 0;
     struct stat statbuf;
+    char *tmp1 = NULL;
+    char *tmp2 = NULL;
 
     malloc_string(sz_datefile);
@@ -1586 +1588 @@
         mr_msg(2, "include_paths = '%s'", include_paths);
         mr_msg(1, "Calculating filelist");
-        mr_asprintf(&exclude_paths, " %s %s %s %s %s %s %s . .. \
-" MNT_CDROM " /mnt/floppy /media \
-/proc /sys /tmp /var/log/lastlog /root/images/mondo " MINDI_CACHE " " MONDO_CACHE, excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        mr_asprintf(&tmp2, call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|fat|vfat|dos' | awk '{print $3}'"));
+        if (strlen(tmp2) < 1) {
+            mr_asprintf(&tmp1,"");
+        } else {
+            mr_msg(2, "Found windows FS: %s",tmp2);
+            mr_asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
+            mr_free(tmp2);
+            mr_asprintf(&tmp2, call_program_and_get_last_line_of_output(tmp1));
+            mr_msg(2, "Found windows files: %s",tmp2);
+        }
+        mr_free(tmp1);
 
         mr_msg(2, "Excluding paths = '%s'", exclude_paths);
+        mr_asprintf(&exclude_paths, " %s %s %s %s %s %s . .. \
+" MNT_CDROM " " MNT_FLOPPY " /media /tmp /var/log/lastlog \
+/proc /sys /root/images/mondo ", MINDI_CACHE, MONDO_CACHE, excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        paranoid_free(tmp2);
+
         mr_msg(2,
                 "Generating skeleton filelist so that we can track our progress");

branches/stable/mondo/src/common/libmondo-stream.c

@@ -885 +885 @@
         return (1);
     }
+    /* Not used
     mr_asprintf(&tmp, "Reading file from tape; writing to '%s'; %ld KB",
              outfname, (long) size >> 10);
-    log_to_screen(tmp);
-    mr_free(tmp);
+            */
 
     if (foutstream) {

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

@@ -901 +901 @@
 
     // abort if Windows partition but no ms-sys and parted
-    if (!run_program_and_log_output
-        ("mount | grep -w vfat | grep -vE \"/dev/fd|nexdisk\"", 0)
-        ||
-        !run_program_and_log_output
-        ("mount | grep -w dos | grep -vE \"/dev/fd|nexdisk\"", 0)) {
+    if (!run_program_and_log_output("mount | grep -Ew 'vfat|fat|dos' | grep -vE \"/dev/fd|nexdisk\"", 0)) {
         log_to_screen(_("I think you have a Windows 9x partition."));
         retval += whine_if_not_found("parted");
-#ifndef __IA64__
-        /* IA64 always has one vfat partition for EFI even without Windows */
-        // retval += 
-        if (!find_home_of_exe("ms-sys")) {
-            log_to_screen("Please install ms-sys just in case.");
-        }
-#endif
     }
 

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

@@ -259 +259 @@
     kill_anything_like_this(char *str) {
 
-    char *tmp = NULL;
-
-    mr_asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"`", ps_options, str, ps_proc_id);
+char *tmp = NULL;
+char *tmp1 = NULL;
+
+    mr_asprintf(&tmp,"ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"", ps_options, str, ps_proc_id);
     run_program_and_log_output(tmp, TRUE);
+    if (strlen(tmp) > 0) {
+        mr_asprintf(&tmp1,"kill `%s`", tmp);
+        run_program_and_log_output(tmp1, TRUE);
+        paranoid_free(tmp1);
+    }
     mr_free(tmp);
 }