Changeset 808 in MondoRescue

Timestamp:

Sep 22, 2006, 11:12:37 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r793:807 $SVN_M/branches/stable
src => common for the moment it's easier to manage merges

Location:

trunk

Files:

• mindi/README.pxe (modified) (1 diff)
• mindi/distributions/debian/rules (modified) (1 diff)
• mindi/mindi (modified) (4 diffs)
• mindi/rootfs/sbin/start-nfs (modified) (4 diffs)
• mondo/mondo/common (moved) (moved from trunk/mondo/mondo/src )
• mondo/mondo/common/libmondo-devices.c (modified) (2 diffs)
• mondo/mondo/common/libmondo-fifo.c (modified) (1 diff)
• mondo/mondo/common/libmondo-files.c (modified) (3 diffs)
• mondo/mondo/common/newt-specific.c (modified) (1 diff)
• mondo/mondo/mondoarchive/main.c (modified) (3 diffs)
• mondo/mondo/mondoarchive/mondo-cli.c (modified) (1 diff)
• mondo/mondo/mondorestore/mondo-restore.c (modified) (1 diff)
• mondo/mondo/mondorestore/mondo-rstr-tools.c (modified) (4 diffs)
• website/OBDR-3.pdf (copied) (copied from branches/stable/website/OBDR-3.pdf )
• website/obdr1-1.pdf (copied) (copied from branches/stable/website/obdr1-1.pdf )

trunk/mindi/README.pxe

@@ -11 +11 @@
 label mondo
         kernel vmlinuz-mondo
-        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=36864 rw root=/dev/ram iso_mode acpi=off apm=off devfs=nomount exec-shield=0 pxe [prefix="machine"] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [nfsmount=server:mountpoint] [ping=#] ...
+        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=36864 rw root=/dev/ram iso_mode acpi=off apm=off devfs=nomount exec-shield=0 pxe [prefix=machine] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [nfsmount=server:mountpoint] [ping=#] ...
 
 ipdev is the device name (e.g. eth2)

trunk/mindi/distributions/debian/rules

@@ -26 +26 @@
     dh_installdirs
     # Build the installation tree:
-    ( export PREFIX=$(CURDIR)/debian/$(PACKAGE_NAME)/usr && export CONFDIR=$(CURDIR)/debian/$(PACKAGE_NAME)/etc && ./install.sh )
+    ( export RPMBUILDMINDI=true && export PREFIX=$(CURDIR)/debian/$(PACKAGE_NAME)/usr && export CONFDIR=$(CURDIR)/debian/$(PACKAGE_NAME)/etc && ./install.sh )
 
 # Build architecture-independent files here.

trunk/mindi/mindi

@@ -534 +534 @@
     local my_partitions i
     echo "MINDI_VERSION is $MINDI_VERSION" >> $LOGFILE
+    echo "End date : `date`" >> $LOGFILE
     if [ "$1" = "" ] ; then
-    LogIt "Fatal error\n"
-    else
-    LogIt "Fatal error. $1\n"
+        LogIt "Fatal error\n"
+    else
+        LogIt "Fatal error. $1\n"
     fi
     sync
@@ -1422 +1423 @@
             actual_dev=""
     
-            # 1st try : blkid, the good way for all LABEL
+            # 1st try : blkid, the good way for all LABEL except swap
             if [ -x "/sbin/blkid" ]; then
                 actual_dev=`/sbin/blkid | /bin/grep "$redhat_label" | grep LABEL= | /bin/cut -d':' -f1`
@@ -3022 +3023 @@
 echo "mindi called with the following arguments:" >> $LOGFILE
 echo "$@" >> $LOGFILE
+echo "Start date : `date`" >> $LOGFILE
 
 if [ -e "/etc/conf.modules" ] && [ ! -e "/etc/modules.conf" ] ; then
@@ -3483 +3485 @@
 done
 echo "Mindi is exiting" >> $LOGFILE
+echo "End date : `date`" >> $LOGFILE
 exit 0

trunk/mindi/rootfs/sbin/start-nfs

@@ -3 +3 @@
 # $Id$
 #
-# This script set up the network + NFS environement if needed.
+# This script sets up the network + NFS environment if needed.
 #
 
@@ -17 +17 @@
 ipgateway=`grep nfs-client-defgw /tmp/mondo-restore.cfg | cut -d' ' -f2-`
 ipconf=""
-nfsmount=`grep nfs-server-mount /tmp/mondo-restore.cfg | cut -d' ' -f2-`
-imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+export nfsmount=`grep nfs-server-mount /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+export imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d' ' -f2-`
 if [ "$imgname" = "" ]; then
-    imgname="mondorescue"
+    export imgname="mondorescue"
 fi
-dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+export dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' ' -f2-`
 if [ "$dirimg" = "" ]; then
-    dirimg="/"
+    export dirimg="/"
 fi
 
@@ -31 +31 @@
     echo $i | grep -qi ping= && ipcount=`echo $i | cut -d= -f2`
     echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`
-    echo $i | grep -qi nfsmount= && nfsmount=`echo $i | cut -d= -f2`
-    echo $i | grep -qi prefix= && imgname=`echo $i | cut -d= -f2`
+    echo $i | grep -qi nfsmount= && export nfsmount=`echo $i | cut -d= -f2`
+    echo $i | grep -qi prefix= && export imgname=`echo $i | cut -d= -f2`
 done
 
@@ -73 +73 @@
 mount -t nfs -o nolock $nfsmount /tmp/isodir
 
-LogIt "Mounting NFS image $imgname-1.iso in $dirimg on /mnt/cdrom in loopback"
-losetup /dev/loop7 /tmp/isodir/$dirimg/$imgname-1.iso
+LogIt "Mounting NFS image ${imgname}-1.iso in $dirimg on /mnt/cdrom in loopback"
+losetup /dev/loop7 /tmp/isodir/$dirimg/${imgname}-1.iso
 mount -o ro -t iso9660 /dev/loop7 /mnt/cdrom

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

@@ -1823 +1823 @@
                     bkpinfo->media_size[i] = atoi(sz_size);
                 }
-                paranoid_free(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)) {
-                    log_to_screen("User has chosen not to backup the PC");
-                    finish(1);
-                }
-                log_msg(3, "prefix set to %s", bkpinfo->prefix);
             } else {
                 for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
@@ -1839 +1829 @@
             }
         }
+        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);
+        }
+        log_msg(3, "prefix set to %s", bkpinfo->prefix);
         break;
     default:

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

@@ -158 +158 @@
     sync();
     asprintf(&command,
-            "ps | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'", ps_options,
+            "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'", ps_options,
             g_sz_call_to_buffer);
     paranoid_free(g_sz_call_to_buffer);

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

@@ -1027 +1027 @@
     /*@ buffers ******** */
     char *nfs_dev = NULL;
+    char *mac_addr = NULL;
     char *nfs_mount = NULL;
     char *nfs_client_ipaddr = NULL;
@@ -1051 +1052 @@
 
     asprintf(&nfs_mount, p);
+    /* BERLIOS : there is a bug #67 here as it only considers the first NIC */
     asprintf(&command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
@@ -1088 +1090 @@
     }
     make_hole_for_dir("/var/cache/mondo-archive");
+    /********
+    * If the NFS device that found above is a bonded device, 
+    * we need to replace it with an ethN device or the
+    * networking will not start during an NFS restore.
+    *
+    * If the NFS device in nfs_dev begins with the word "bond", 
+    * look for the corresponding slave ethN device and copy it to nfs_dev.
+    * Using the common MAC address
+    ********/
+    if (!strncmp(nfs_dev, "bond", 4)) {
+        log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
+        asprintf(&command,
+                "ifconfig %s | awk '{print $5}'", nfs_dev);
+        mac_addr = call_program_and_get_last_line_of_output(command);
+        asprintf(&command,
+                "ifconfig | grep -E '%s' | head -n1  | cut -d' ' -f1", mac_addr);
+        paranoid_free(nfs_dev);
+        nfs_dev = call_program_and_get_last_line_of_output(command);
+        paranoid_free(command);
+        paranoid_free(mac_addr);
+
+        log_to_screen("Replacing it with %s\n", nfs_dev);
+    }
 
     asprintf(&tmp, "%s/NFS-DEV", bkpinfo->tmpdir);

trunk/mondo/mondo/common/newt-specific.c

@@ -240 +240 @@
 char *tmp = NULL;
 
-asprintf(&tmp,"kill `ps %s | grep \"" %s "\" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);
+asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);
 run_program_and_log_output(tmp, TRUE);
 paranoid_free(tmp);

trunk/mondo/mondo/mondoarchive/main.c

@@ -167 +167 @@
     /* Initialize Configuration Structure */
     mr_archive_init_conf(bkpinfo->mr_conf);
-
+    log_msg(0, "Start date : %s", get_time());
 
     /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
@@ -182 +182 @@
     unlink(MONDO_LOGFILE);
 
-/* Configure the bkpinfo structure, global file paths, etc. */
+    /* Configure the bkpinfo structure, global file paths, etc. */
     g_main_pid = getpid();
     log_msg(9, "This");
@@ -417 +417 @@
 
     run_program_and_log_output("date", 1);
+    log_msg(0, "End date : %s", get_time());
 
     if (!g_text_mode) {

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

@@ -512 +512 @@
             if (q != NULL) {
                 *q = '\0';
+                /* Fix bug 14 where ending / cause a problem later 
+                 * so handled here for the moment */
+                q--;
+                if (*q = '/') {
+                    *q = '\0';
+                }
+                q++;
+                /* End of bug fix */
                 if (stat(p, &buf) != 0) {
                     log_msg(1, "WARNING ! %s doesn't exist", p);

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -2919 +2919 @@
         paranoid_MR_finish(retval);
     } else {
-/* Disaster recovery mode (must be) */
+        /* Disaster recovery mode (must be) */
         log_msg(1, "I must be in disaster recovery mode.");
         log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -851 +851 @@
                 paranoid_alloc(bkpinfo->prefix, STD_PREFIX);
             }
+            /* We need to override prefix value in PXE mode as it's 
+             * already done in start-nfs */
+            if (strstr(call_program_and_get_last_line_of_output
+               ("cat /proc/cmdline"), "pxe")) {
+                    strcpy(bkpinfo->prefix,getenv("imgname"));
+            }
+
         } else if (!strcmp(value, "tape")) {
             bkpinfo->backup_media_type = tape;
@@ -975 +982 @@
             log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
         }
+        /* We need to override values in PXE mode as it's 
+         * already done in start-nfs */
+        if (strstr(call_program_and_get_last_line_of_output
+           ("cat /proc/cmdline"), "pxe")) {
+                strcpy(bkpinfo->nfs_mount,getenv("nfsmount"));
+                strcpy(bkpinfo->nfs_remote_dir,getenv("dirimg"));
+            }
     } else if (bkpinfo->backup_media_type == iso) {
         /* Patch by Conor Daly 23-june-2004 
@@ -1037 +1051 @@
                     } else {
                         log_msg(1,
-                                "You backed up to disk, then burned some CDs. Naughty monkey!");
+                                "You backed up to disk, then burned some CDs.");
                     }
                 }
@@ -2385 +2399 @@
 
     assert(wait_for_percentage <= 100);
-    iamhere("Help, my boat is sync'ing. (Get it? Urp! Urp!)");
+    iamhere("wait_until_software_raids_are_prepped");
     while (unfinished_mdstat_devices > 0) {
         if (parse_mdstat(raidlist, "/dev/")) {