Changeset 1903 in MondoRescue for branches/stable/mondo

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

Files:

• common/libmondo-archive.c (modified) (5 diffs)
• common/libmondo-devices.c (modified) (4 diffs)
• common/libmondo-filelist.c (modified) (2 diffs)
• common/libmondo-stream.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (1 diff)
• common/newt-specific.c (modified) (1 diff)
• mondoarchive/mondo-cli.c (modified) (2 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (13 diffs)
• mondorestore/mondorestore.c (modified) (8 diffs)

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);
 }

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -472 +472 @@
     if (flag_set['n']) {
         bkpinfo->backup_media_type = nfs;
+        /* Never try to eject a NFS device */
+        bkpinfo->please_dont_eject = TRUE;
     }
     if (flag_set['r']) {
@@ -761 +763 @@
                 (_("Your kernel appears not to support vfat filesystems. I am therefore"));
             log_to_screen
-                (_("using LILO instead of SYSLINUX as the CD's boot loader."));
+                (_("using LILO instead of SYSLINUX as the media boot loader."));
         }
         if (run_program_and_log_output("which mkfs.vfat", 2)) {

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

@@ -56 +56 @@
 char *g_getfacl = NULL;
 
+extern void kill_anything_like_this(char *str);
+
 /**
  * @addtogroup restoreUtilityGroup
@@ -387 +389 @@
 
     char *command = NULL;
+    char *tmp = NULL;
     char *mountdir = NULL;
     char *mountpoint = NULL;
@@ -439 +442 @@
         mr_msg(2, "command='%s'", command);
     }
+
     res = run_program_and_log_output(command, TRUE);
+    if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
+        mr_msg(1, "Re-trying without the fancy extra parameters");
+        mr_asprintf(&tmp, "mount -t %s %s %s 2>> %s", format, device,
+            mountdir, MONDO_LOGFILE);
+        res = run_program_and_log_output(tmp, TRUE);
+        mr_free(tmp);
+    }
     if (res) {
         mr_msg(1, "Unable to mount device %s (type %s) at %s", device,
@@ -449 +460 @@
         } else {
             mr_msg(2, "Retrying w/o the '-t' switch");
-            mr_free(command);
-
-            mr_asprintf(&command, "mount %s %s 2>> %s", device, mountdir,
+            mr_asprintf(&tmp, "mount %s %s 2>> %s", device, mountdir,
                     MONDO_LOGFILE);
-            mr_msg(2, "2nd command = '%s'", command);
-            res = run_program_and_log_output(command, TRUE);
+            mr_msg(2, "2nd command = '%s'", tmp);
+            res = run_program_and_log_output(tmp, TRUE);
+            mr_free(tmp);
             if (res == 0) {
                 mr_msg(1,
@@ -473 +483 @@
     }
     mr_free(mountpoint);
-
     return (res);
 }
@@ -623 +632 @@
             mr_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
+
 #ifdef __FreeBSD__
         mr_asprintf(&mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
@@ -687 +697 @@
             break;
         } else {
-            mr_msg(2, "Failed to mount CD-ROM drive.");
+            mr_msg(2, "Failed to mount device.");
             sleep(5);
             run_program_and_log_output("sync", FALSE);
@@ -806 +816 @@
         } else if (!strcmp(value, "nfs")) {
             bkpinfo->backup_media_type = nfs;
+            bkpinfo->please_dont_eject = TRUE;
             if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
                 mr_allocstr(bkpinfo->prefix,value);
@@ -842 +853 @@
         fatal_error("backup-media-type not specified!");
     }
+
     if (bkpinfo->disaster_recovery) {
         if (bkpinfo->backup_media_type == cdstream) {
@@ -1286 +1298 @@
 #endif
     char *name = NULL;
+    char *cmd = NULL;
 
     malloc_string(device);
     malloc_string(name);
+
+    /* In order to have a working bootloader, we need to have all devices
+     * ready in the chroot. If they are not there (udev) then copy them from
+     * the current /dev location 
+     */
+    asprintf(&cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING);
+    run_program_and_log_output(cmd, 3);
+    paranoid_free(cmd);
+
     backup_crucial_file(MNT_RESTORING, "/etc/fstab");
     backup_crucial_file(MNT_RESTORING, "/etc/grub.conf");
     backup_crucial_file(MNT_RESTORING, "/etc/lilo.conf");
     backup_crucial_file(MNT_RESTORING, "/etc/elilo.conf");
+    backup_crucial_file(MNT_RESTORING, "/boot/grub/device.map");
+    backup_crucial_file(MNT_RESTORING, "/etc/mtab");
     read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
@@ -1312 +1336 @@
         mr_free(tmp);
     } else {
-        mr_asprintf(&tmp, "ls /dev | grep -Eq '^%ss[1-4].*$'", device);
+        mr_asprintf(&tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
         if (!system(tmp)) {
             mr_free(tmp);
@@ -1534 +1558 @@
                     newtSuspend();
                 }
-                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_asprintf(&tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
                 paranoid_system(tmp);
                 mr_free(tmp);
 
-                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/elilo.conf", editor);
+                mr_asprintf(&tmp, "chroot %s %s /etc/elilo.conf", MNT_RESTORING, editor);
                 paranoid_system(tmp);
                 mr_free(tmp);
@@ -2173 +2197 @@
             if (!does_file_exist("tmp/mondo-restore.cfg")) {
                 log_to_screen(_
-                              ("Cannot find config info on tape/CD"));
+                              ("Cannot find config info on media"));
                 return (1);
             }

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -437 +437 @@
     read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
     iamhere("Done loading config file; resizing ML");
-    if (bkpinfo->backup_media_type != usb) {
+    if (bkpinfo->backup_media_type == nfs) {
         mr_asprintf(&tmp,bkpinfo->prefix);
         if (popup_and_get_string
@@ -1994 +1994 @@
                        _("Please wait. This may take some time."),
                        "", total_slices);
-    for (bigfileno = 0, finished = FALSE; !finished;) {
+    for (bigfileno = 0 ; bigfileno < noof_biggiefiles ;) {
         mr_msg(2, "Thinking about restoring bigfile %ld", bigfileno + 1);
         if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
@@ -2004 +2004 @@
                     g_current_media_number);
             mr_msg(3, "Slicename would have been %s",
-                    slice_fname(bigfileno + 1, 0, ARCHIVES_PATH, ""));
+                    slice_fname(bigfileno, 0, ARCHIVES_PATH, ""));
             // I'm not positive 'just_changed_cds' is even necessary...
             if (just_changed_cds) {
@@ -2017 +2017 @@
                 just_changed_cds = TRUE;
             } else {
+                /* That big file doesn't exist, but the followings may */
+                /* So we need to continue looping */
                 mr_msg(2, "There was no bigfile #%ld. That's OK.",
-                        bigfileno + 1);
+                    bigfileno + 1);
                 mr_msg(2, "I'm going to stop restoring bigfiles now.");
-                finished = TRUE;
+                retval++;
+                bigfileno++;
             }
         } else {
@@ -3012 +3015 @@
     }
 
+    if (argc == 3 && strcmp(argv[1], "-K") == 0) {
+        g_loglevel = atoi(argv[2]);
+        log_msg(1,"Loglevel forced to %s",g_loglevel);
+    }
 
     if (argc == 2 && strcmp(argv[1], "--live-grub") == 0) {
@@ -3169 +3176 @@
             mvaddstr_and_log_it(g_currentY++,
                                 0,
-                                _("Run complete. Please remove CD/media and reboot."));
+                                _("Run complete. Please remove media and reboot."));
         } else {
             run_program_and_log_output("sync", FALSE);
@@ -3226 +3233 @@
     unlink("/tmp/mondo-run-prog.tmp");
     set_signals(FALSE);
-    mr_asprintf(&tmp, "rm -Rf %s", bkpinfo->tmpdir);
-    run_program_and_log_output(tmp, FALSE);
-    mr_free(tmp);
 
     log_to_screen
@@ -3243 +3247 @@
         run_program_and_log_output("mount / -o remount,rw", 2);
     }                           // for b0rken distros
+    mr_asprintf(&tmp, "rm -Rf %s", bkpinfo->tmpdir);
+    run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
+
     paranoid_MR_finish(retval); // frees global stuff plus bkpinfo
     free_libmondo_global_strings(); // it's fine to have this here :) really :)