Changeset 20 in MondoRescue

Timestamp:

Sep 9, 2005, 7:30:28 PM (19 years ago)

Author:

bcornec

Message:

-p option added

Location:

trunk

Files:

• mindi/mindi (modified) (1 diff)
• mindi/mindi.spec (modified) (1 diff)
• mkdeliv (deleted)
• mkrpm (deleted)
• mondo/ChangeLog (modified) (1 diff)
• mondo/configure.in (modified) (3 diffs)
• mondo/mondo/common/libmondo-archive.c (modified) (5 diffs)
• mondo/mondo/common/libmondo-devices.c (modified) (3 diffs)
• mondo/mondo/common/libmondo-tools.c (modified) (2 diffs)
• mondo/mondo/common/libmondo-verify.c (modified) (2 diffs)
• mondo/mondo/common/mondostructures.h (modified) (1 diff)
• mondo/mondo/mondoarchive/mondo-cli.c (modified) (2 diffs)
• mondo/mondo/mondoarchive/mondoarchive.8 (modified) (2 diffs)
• rpm-env (deleted)
• tools (added)
• tools/comp (added)
• tools/mkdeliv (added)
• tools/mkrpm (added)
• tools/rpm-env (added)

trunk/mindi/mindi

@@ -24 +24 @@
     # run this command.
 
-MINDI_VERSION=1.04_cvs_20050503
+MINDI_VERSION=1.04_berlios
 
 EXTRA_SPACE=24576         ; # increase if you run out of ramdisk space

trunk/mindi/mindi.spec

@@ -10 +10 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}
 Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools
-Conflicts:  bonnie++
+# Not on all systems
+#Conflicts: bonnie++
 Prefix:     %{_prefix}
 Autoreq:    0

trunk/mondo/ChangeLog

@@ -1 @@
-MONDO CHANGES          Hugo Rabson <hugorabson@msn.com>             10/13/2004
+MONDO CHANGES          Hugo Rabson <hugorabson@msn.com>             2005-09-09
+
+
+v2.04_berlios (Bruno Cornec <bcornec@users.berlios.de)
+- Add -p option to generate ISO images file names with prefix. The new default
+  name for ISO images is mondorescue-1.iso, ...
+- Mandrake 2005 support
+- NFS patches (Yann Aubert <technique@alixen.fr>)
 
 

trunk/mondo/configure.in

@@ -1 @@
-dnl Autoconfigure file for Mondo Rescue v2.0x_cvs
+dnl Autoconfigure file for Mondo Rescue v2.0x_berlios
 dnl Mondo by Hugo Rabson
 dnl This script by Joshua Oreman
@@ -7 +7 @@
 dnl $Id: configure.in,v 1.3 2004/06/18 18:40:30 oremanj Exp $
 dnl
-AC_INIT([Mondo Rescue],[2.03],[mondo-devel@lists.sourceforge.net])
+AC_INIT([Mondo Rescue],[2.04_berlios],[mondo-devel@lists.sourceforge.net])
 AC_CONFIG_SRCDIR([mondo/mondoarchive/main.c])
 AM_CONFIG_HEADER(config.h)
@@ -15 +15 @@
 AC_ARG_PROGRAM
 
-AM_INIT_AUTOMAKE([mondo], [2.03])
+AM_INIT_AUTOMAKE([mondo], [2.04_berlios])
 AM_MAINTAINER_MODE
 

trunk/mondo/mondo/common/libmondo-archive.c

@@ -1223 +1223 @@
  * - @c backup_media_type
  * - @c cdrw_speed
+ * - @c prefix
  * - @c isodir
  * - @c media_device
@@ -1280 +1281 @@
     }
 
-  sprintf (command, "rm -f %s/[1-9]*.iso", bkpinfo->isodir);
+  sprintf (command, "rm -f %s/%s-[1-9]*.iso", bkpinfo->prefix, bkpinfo->isodir);
   paranoid_system (command);
   wipe_archives (bkpinfo->scratchdir);
@@ -1911 +1912 @@
 // and add ' .' at end
 #ifdef __IA64__
-              log_msg(1, "IA64 --> lilo");
+              log_msg(1, "IA64 --> elilo");
               res =
                 eval_call_to_make_ISO (bkpinfo,
@@ -3536 +3537 @@
 
 /**
- * Write an ISO image to <tt>[bkpinfo->isodir]/[g_current_media_number].iso</tt>.
+ * Write an ISO image to <tt>[bkpinfo->isodir]/bkpinfo->prefix-[g_current_media_number].iso</tt>.
  * @param bkpinfo The backup information structure. Fields used:
  * - @c backup_media_type
+ * - @c prefix
  * - @c isodir
  * - @c manual_cd_tray
@@ -3623 +3625 @@
       log_to_screen (tmp);
     }
-  sprintf (isofile, "%s/%s/%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir,
-           g_current_media_number);
+  sprintf (isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir,
+           bkpinfo->prefix, g_current_media_number);
   for (that_one_was_ok = FALSE; !that_one_was_ok;)
     {

trunk/mondo/mondo/common/libmondo-devices.c

@@ -1662 +1662 @@
  * @param bkpinfo The backup information structure. Fields used:
  * - @c bkpinfo->backup_media_type
+ * - @c bkpinfo->prefix
  * - @c bkpinfo->isodir
  * - @c bkpinfo->media_device
@@ -1701 +1702 @@
       if (is_this_device_mounted(MNT_CDROM)) { run_program_and_log_output("umount "MNT_CDROM, 5); }
       system("mkdir -p /tmp/isodir &> /dev/null");
-      sprintf(tmp, "%s/%s/%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, cd_number_i_want);
+      sprintf(tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
       if (!does_file_exist(tmp))
         {
-      sprintf(tmp, "/tmp/isodir/%s/%d.iso", bkpinfo->nfs_remote_dir, cd_number_i_want);
+      sprintf(tmp, "/tmp/isodir/%s/%s-%d.iso", bkpinfo->nfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
       if (does_file_exist(tmp))
         {
@@ -2048 +2049 @@
                      { log_to_screen ("User has chosen not to backup the PC"); finish(1); }
                  for(i=0; i<=MAX_NOOF_MEDIA; i++) { bkpinfo->media_size[i] = atoi (sz_size); }
+             if (!popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix, MAX_STR_LEN/4))
+          { log_to_screen("User has chosen not to backup the PC"); finish(1); }
              } else {
                  for (i=0;i<=MAX_NOOF_MEDIA; i++) { bkpinfo->media_size[i] = 650;}

trunk/mondo/mondo/common/libmondo-tools.c

@@ -572 +572 @@
  * - Used: @c bkpinfo->compression_level
  * - Used: @c bkpinfo->include_paths
+ * - Used: @c bkpinfo->prefix
  * - Used: @c bkpinfo->isodir
  * - Used: @c bkpinfo->manual_cd_tray
@@ -983 +984 @@
   else
     { strcpy (bkpinfo->isodir, "/root/images/mondo"); }
+  strcpy (bkpinfo->prefix, "mondorescue");
 
   bkpinfo->scratchdir[0] = '\0';

trunk/mondo/mondo/common/libmondo-verify.c

@@ -966 +966 @@
  * @param bkpinfo The backup information structure. Fields used:
  * - @c bkpinfo->isodir
+ * - @c bkpinfo->prefix
  * - @c bkpinfo->manual_cd_tray
  * - @c bkpinfo->media_device
@@ -1003 +1004 @@
 
   sprintf (mountpoint, "%s/cdrom", bkpinfo->tmpdir);
-  sprintf (fname, "%s/%s/%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir,
-       g_current_media_number);
+  sprintf (fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, 
+          bkpinfo->nfs_remote_dir, g_current_media_number);
 
   mkdir (mountpoint, 1777);

trunk/mondo/mondo/common/mondostructures.h

@@ -443 +443 @@
    */
   char isodir[MAX_STR_LEN/4];
+
+/**
+   * The prefix to put in front of media number
+   * If backup_media_type is @b iso, then this is the prefix for the filename
+   * If backup_media_type is anything else, this is ignored.
+   */
+  char prefix[MAX_STR_LEN/4];
 
   /**

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -697 +697 @@
           log_to_screen(tmp);
     }
+    }
+if (flag_set['p'])
+    {
+      strncpy (bkpinfo->prefix, flag_val['p'], MAX_STR_LEN/4);
     }
 
@@ -945 +949 @@
   while ((opt =
       getopt (argc, argv,
-          "0123456789A:B:CDE:FHI:J:K:LNOP:QRS:T:VWb:c:d:ef:gik:l:mn:ors:tuw:x:")) !=
+          "0123456789A:B:CDE:FHI:J:K:LNOP:QRS:T:VWb:c:d:ef:gik:l:mn:op:rs:tuw:x:")) !=
      -1)
     {

trunk/mondo/mondo/mondoarchive/mondoarchive.8

@@ -1 @@
-.TH mondoarchive 8 "June 2004" Linux MondoRescue
+.TH mondoarchive 8 "September 2005" Linux MondoRescue
 
 .SH NAME
@@ -76 +76 @@
 write-once disks as backup media.
 .B Experimental.
+
+.TP
+.BI "-p " prefix
+Use 
+.B prefix 
+to generate the name of your ISO images.
+By default, mondoarchive calls images mondorescue-1.iso, mondorescue-2.iso, ...
+Using 
+.B -p machine
+it will call your images machine-1.iso, machine-2.iso, ...
 
 .TP