Changeset 1708 in MondoRescue for branches/2.2.5

Timestamp:

Oct 27, 2007, 4:42:34 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Supress g_erase_tmpdir_and_scratchdir
• Improve some log messages for USB support
• Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(

Location:

branches/2.2.5

Files:

• mindi/install.sh (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (2 diffs)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (4 diffs)
• mondo/src/common/newt-specific.c (modified) (5 diffs)
• mondo/src/mondoarchive/main.c (modified) (3 diffs)

branches/2.2.5/mindi/install.sh

@@ -72 +72 @@
 
 echo "Copying files ..."
-install -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $locallib/mindi
+install -m 644 isolinux.cfg msg-txt sys-disk.raw.gz isolinux-H.cfg syslinux.cfg syslinux-H.cfg dev.tgz $sublocallib
 install -m 644 deplist.txt $conf
 

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

@@ -1335 +1335 @@
                         "Writing any remaining data to media         ");
 
-    log_msg(1, "Closing tape/CD ... ");
-    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type))
+    log_msg(1, "Closing tape/CD/USB ... ");
+    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         /* write tape/cdstream */
-    {
         closeout_tape();
-    } else
+    } else {
         /* write final ISO/USB */
-    {
         res = write_final_iso_if_necessary();
         retval += res;
@@ -1424 +1422 @@
         write_data_disks_to_stream(data_disks_file);
     } else {
-        log_msg(1, "Backing up to CD's");
+        if (bkpinfo->backup_media_type == usb) {
+            log_msg(1, "Backing up to USB's");
+        } else {
+            log_msg(1, "Backing up to CD's");
+        }
     }
 

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

@@ -258 +258 @@
 
 extern bool g_ISO_restore_mode;
-extern char *g_erase_tmpdir_and_scratchdir;
 extern char *g_selfmounted_isodir;
 extern char *MONDO_LOGFILE;

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

@@ -191 +191 @@
 
 extern int g_tape_buffer_size_MB;
-extern char *g_erase_tmpdir_and_scratchdir;
 extern char *g_serial_string;
 extern bool g_text_mode;
@@ -1622 +1621 @@
         malloc_string(g_mondo_home);
         malloc_string(g_tmpfs_mountpt);
-        malloc_string(g_erase_tmpdir_and_scratchdir);
         malloc_string(g_serial_string);
         malloc_string(g_magicdev_command);
@@ -1629 +1627 @@
         paranoid_free(g_mondo_home);
         paranoid_free(g_tmpfs_mountpt);
-        paranoid_free(g_erase_tmpdir_and_scratchdir);
         paranoid_free(g_serial_string);
         paranoid_free(g_magicdev_command);
@@ -1639 +1636 @@
        &g_mondo_home,
        &g_tmpfs_mountpt,
-       &g_erase_tmpdir_and_scratchdir,
        &g_serial_string,
        &g_magicdev_command,

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

@@ -191 +191 @@
      g_xmondo_stdout[MAX_NEWT_COMMENT_LEN]; ///< .... @bug Unneeded w/current XMondo.
     bool g_called_by_xmondo = FALSE;    ///< @bug Unneeded w/current XMondo.
-    char *g_erase_tmpdir_and_scratchdir;    ///< The command to run to erase the tmpdir and scratchdir at the end of Mondo.
     char *g_selfmounted_isodir; ///< Holds the NFS mountpoint if mounted via mondoarchive.
 
@@ -420 +419 @@
         }
 
-        if (g_erase_tmpdir_and_scratchdir[0]) {
-            run_program_and_log_output(g_erase_tmpdir_and_scratchdir, 5);
-        }
-
         if (g_selfmounted_isodir) {
             sprintf(command, "umount %s", g_selfmounted_isodir);
@@ -470 +465 @@
     void
      finish(int signal) {
-        char *command;
-        malloc_string(command);
+        char *command = NULL;
 
         /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
@@ -483 +477 @@
                                    FALSE);
         if (g_selfmounted_isodir) {
-            sprintf(command, "umount %s", g_selfmounted_isodir);
+            asprintf(&command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
-            sprintf(command, "rmdir %s", g_selfmounted_isodir);
+            paranoid_free(command);
+            asprintf(&command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
+            paranoid_free(command);
         }
         if (!g_text_mode) {
@@ -499 +495 @@
         printf("Execution run ended; result=%d\n", signal);
         printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
-        if (g_erase_tmpdir_and_scratchdir) {
-            system(g_erase_tmpdir_and_scratchdir);
-        }
+        asprintf(&command, "rm -Rf %s %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
+        system(command);
         paranoid_free(command);
         paranoid_free(bkpinfo);

branches/2.2.5/mondo/src/mondoarchive/main.c

@@ -133 +133 @@
 extern char *g_mondo_home;
 extern char *g_tmpfs_mountpt;
-extern char *g_erase_tmpdir_and_scratchdir;
 extern char *g_cdrw_drive_is_here;
 static char *g_cdrom_drive_is_here = NULL;
@@ -459 +458 @@
     log_to_screen
         ("BusyBox's sources are available from http://www.busybox.net");
-    sprintf(g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
-            bkpinfo->scratchdir);
 
     /* If we're meant to backup then backup */
@@ -556 +553 @@
     log_msg(0, "Time finished: %s", mr_date());
 
-    chdir("/tmp");              // just in case there's something wrong with g_erase_tmpdir_and_scratchdir
+    chdir("/tmp");
 
     if (!g_text_mode) {