Changeset 1666 in MondoRescue

Timestamp:

Sep 27, 2007, 2:25:24 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Remove useless .keep file
• remove temporary.iso name remaining and suppress a warning in log trying to remove it in the tmpdir

Location:

branches/2.2.5

Files:

• mindi/rootfs/proc/.keep (deleted)
• mondo/src/common/libmondo-tools.c (modified) (2 diffs)
• mondo/src/common/my-stuff.h (modified) (1 diff)

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

@@ -768 +768 @@
             if (bkpinfo->call_before_iso[0] == '\0') {
             sprintf(bkpinfo->call_before_iso,
-                        "%s -o %s/temporary.iso . 2>> _ERR_",
+                        "%s -o %s/"MONDO_TMPISOS" . 2>> _ERR_",
                         mondo_mkisofs_sz, bkpinfo->tmpdir);
                 } else {
                 strncpy(call_before_iso_user, bkpinfo->call_before_iso, MAX_STR_LEN);
                 sprintf (bkpinfo->call_before_iso,
-                                    "( %s -o %s/temporary.iso . 2>> _ERR_ ; %s )",
+                                    "( %s -o %s/"MONDO_TMPISOS" . 2>> _ERR_ ; %s )",
                         mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
             }
             log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
             sprintf(bkpinfo->call_make_iso,
-                    "%s %s -v %s fs=4m dev=%s speed=%d %s/temporary.iso",
+                    "%s %s -v %s fs=4m dev=%s speed=%d %s/"MONDO_TMPISOS,
                     cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject",
                     extra_cdrom_params, bkpinfo->media_device,
@@ -887 +887 @@
     if (retval) {
         fprintf(stderr, "Type 'man mondoarchive' for help.\n");
-    }
-    sprintf(tmp, "%s", MONDO_TMPISOS);  /* added #define 22 apr 2002 */
-    if (does_file_exist(tmp)) {
-        unlink(tmp);
     }
     if (strlen(bkpinfo->tmpdir) < 2 || strlen(bkpinfo->scratchdir) < 2) {

branches/2.2.5/mondo/src/common/my-stuff.h

@@ -351 +351 @@
  * The stub name of the temporary ISO image to create, burn, and remove.
  */
-#define MONDO_TMPISOS "/temporary.iso"
+#define MONDO_TMPISOS "temporary.iso"
 
 /**