Changeset 1737 in MondoRescue

Timestamp:

Oct 30, 2007, 2:40:09 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Message fixes
• Fix when restoring from USB: media is asked in interactive mode

Location:

branches/2.2.5

Files:

• mindi/mindi (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (3 diffs)
• mondo/src/common/libmondo-tools.c (modified) (1 diff)
• mondo/src/mondoarchive/mondo-cli.c (modified) (6 diffs)

branches/2.2.5/mindi/mindi

@@ -3059 +3059 @@
 [ -f "$MINDI_LIB/vmlinuz" ] && FAILSAFE_KVER=`strings $MINDI_LIB/vmlinuz 2> /dev/null | grep -E "2\.[46]" | cut -d' ' -f1`
 
-if ! which mkfs.vfat &> /dev/null ; then
+if ! which mkfs.vfat 1> /dev/null 2> /dev/null ; then
     Die "mkfs.vfat missing from your filesystem - please install your dosfstools RPM or DEB package. Perhaps your PATH environmental variable is broken, too?"
 fi

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

@@ -1912 +1912 @@
             }
         }
+        /* No break because we continue even for usb */
     case cdstream:
-        if (bkpinfo->disaster_recovery) {
+        if ((bkpinfo->disaster_recovery) && (bkpinfo->backup_media_type != usb)) {
             strcpy(bkpinfo->media_device, "/dev/cdrom");
             log_msg(2, "CD-ROM device assumed to be at %s",
                     bkpinfo->media_device);
-        } else if (bkpinfo->restore_data
+        } else if ((bkpinfo->restore_data && (bkpinfo->backup_media_type != usb))
                    || bkpinfo->backup_media_type == dvd) {
             if (!bkpinfo->media_device[0]) {
@@ -1942 +1943 @@
                     bkpinfo->media_device);
         } else {
-            if (find_cdrw_device(bkpinfo->media_device)) {
+            if ((find_cdrw_device(bkpinfo->media_device)) && (bkpinfo->backup_media_type != usb)) {
                 bkpinfo->media_device[0] = '\0';
             }
@@ -1955 +1956 @@
             }
             if (!bkpinfo->media_device[0]) {
-                if (g_kernel_version < 2.6) {
-                    i = popup_and_get_string("Device node?",
+                if (bkpinfo->backup_media_type == usb) {
+                    i = popup_and_get_string("/dev entry?",
+                                         "What is the /dev entry of your USB Disk/Key, please?",
+                                         bkpinfo->media_device,
+                                         MAX_STR_LEN / 4);
+                } else {
+                    if (g_kernel_version < 2.6) {
+                        i = popup_and_get_string("Device node?",
                                              "What is the SCSI node of your CD (re)writer, please?",
-                                             bkpinfo->media_device,
-                                             MAX_STR_LEN / 4);
-                } else {
-                    if (bkpinfo->backup_media_type == usb) {
-                        i = popup_and_get_string("/dev entry?",
-                                             "What is the /dev entry of your USB Disk/Key, please?",
                                              bkpinfo->media_device,
                                              MAX_STR_LEN / 4);

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

@@ -1112 +1112 @@
                         "Checking sanity of your Linux distribution");
 #ifndef __FreeBSD__
-    if (system("which mkfs.vfat &> /dev/null")
-        && !system("which mkfs.msdos &> /dev/null")) {
+    if (system("which mkfs.vfat 2> /dev/null 1> /dev/null")
+        && !system("which mkfs.msdos 2> /dev/null 1> /dev/null")) {
         log_it
             ("OK, you've got mkfs.msdos but not mkfs.vfat; time for the fairy to wave her magic wand...");

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

@@ -805 +805 @@
             strncpy(bkpinfo->isodir, flag_val['d'], MAX_STR_LEN / 4);
             sprintf(tmp, "ls -l %s", bkpinfo->isodir);
-            if (run_program_and_log_output(tmp, FALSE)) {
+            if (run_program_and_log_output(tmp, 2)) {
                 fatal_error
                     ("output folder does not exist - please create it");
@@ -820 +820 @@
         sprintf(tmp, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
                 bkpinfo->nfs_remote_dir);
-        if (run_program_and_log_output(tmp, FALSE)) {
+        if (run_program_and_log_output(tmp, 2)) {
             retval++;
             sprintf(tmp,
@@ -930 +930 @@
     if (flag_set['L']) {
         bkpinfo->use_lzo = TRUE;
-        if (run_program_and_log_output("which lzop", FALSE)) {
+        if (run_program_and_log_output("which lzop", 2)) {
             retval++;
             log_to_screen
@@ -939 +939 @@
     if (flag_set['G']) {
         bkpinfo->use_gzip = TRUE;
-        if (run_program_and_log_output("which gzip", FALSE)) {
+        if (run_program_and_log_output("which gzip", 2)) {
             retval++;
             log_to_screen
@@ -949 +949 @@
         &&
         !run_program_and_log_output
-        ("grep -Ei suse /etc/issue.net | grep -E '9.0' | grep 64", TRUE)) {
+        ("grep -Ei suse /etc/issue.net | grep -E '9.0' | grep 64", 2)) {
         bkpinfo->make_cd_use_lilo = TRUE;
         log_to_screen
@@ -966 +966 @@
                 ("using LILO instead of SYSLINUX as the CD/floppy's boot loader.");
         }
-        if (run_program_and_log_output("which mkfs.vfat", FALSE)) {
+        if (run_program_and_log_output("which mkfs.vfat", 2)) {
             bkpinfo->make_cd_use_lilo = TRUE;
 #ifdef __IA32__