Changeset 1408 in MondoRescue

Timestamp:

May 7, 2007, 2:07:32 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix a Debian packaging bug
• Do not use mindi-boot.2880.img (which may not exist) anymore in mondorestore
• Adds a debuging message for image_devs for mondo
• Adds some useful log info for debugging at restore time in init
• Debian stores its optimised libraries in /lib/i686/cmov now. (Andree Leidenfrost)
• Fix a bug on lsmod | sed. (Andree Leidenfrost). As a consequence, lsmod is not used anymo

re in mindi (except for log). Replaced by /proc/modules. And the MODULES variable is now us
ed to avoid code duplication.

Location:

branches/stable

Files:

• mindi/distributions/debian/rules (modified) (1 diff)
• mindi/mindi (modified) (9 diffs)
• mindi/rootfs/sbin/init (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

branches/stable/mindi/distributions/debian/rules

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

branches/stable/mindi/mindi

@@ -473 +473 @@
         echo -en "."
         reason=""
-        vanilla_lib_name=`echo "$optimized_lib_name" | sed s/i[5-7]86// | tr -s '/' '/'`
+        vanilla_lib_name=`echo "$optimized_lib_name" | sed -e 's/i[5-7]86//' -e 's/cmov//' | tr -s '/' '/'`
         echo "$vanilla_lib_name" >> $filelist
         resolved=$vanilla_lib_name
@@ -940 +940 @@
     local module_list module fname oss r kern
     oss="/root/oss/modules"
-    module_list="`lsmod | sed -n '2,$s/ .*//'`"
+    module_list="$MODULES"
     # Remove unwanted modules from list
     for i in $DENY_MODS; do
@@ -977 +977 @@
             if echo $fname | grep lvm &> /dev/null ; then
                 echo "This warning only affects you if you are using LVM." >> $LOGFILE
-                if lsmod | grep lvm &> /dev/null ; then
+                if echo "$MODULES" | grep lvm &> /dev/null ; then
                     echo "I think you are, so please take heed!" >> $LOGFILE
                 else
@@ -1084 +1084 @@
     echo -en "for outerloop in 1 2 3 4 5 ; do\necho -en \".\"\n" >> $outfile
     # BERLIOS: That code is duplicated - Should be done once only
-    list_to_echo="`lsmod | sed -n '2,$s/ .*//'`"
+    list_to_echo="$MODULES"
     # Remove unwanted modules from list
     for i in $DENY_MODS; do
@@ -2696 +2696 @@
     fi
 
-    lsmod > tmp/original-lsmod.txt
-    
     cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null
     cd $old_pwd
@@ -2814 +2812 @@
 WhichOfTheseModulesAreLoaded() {
     local modname loaded_modules
-    loaded_modules=" `lsmod | tr -s ' ' '\t' | cut -f1 | grep -Fvx "Modules" | tr '\n' ' '` "
+    loaded_modules="$MODULES"
     for modname in $1 ; do
         [ "`echo "$loaded_modules" | grep -F " $modname "`" ] && echo "$modname"
@@ -2869 +2867 @@
     Die "MINDI_CACHE undefined"
 fi
-rm -rf $MINDI_CACHE 2> /dev/null
+rm -rf $MINDI_CACHE/* 2> /dev/null
 mkdir -p $MINDI_CACHE
 
@@ -3037 +3035 @@
 echo "-------------" >> $LOGFILE
 lsmod >> $LOGFILE
+MODULES="`cat /proc/modules | awk '{print $1}'`"
 echo "-------------" >> $LOGFILE
 echo "Liste of extra modules is:" >> $LOGFILE
@@ -3288 +3287 @@
 [ "$YOUR_KERNEL_SUCKS" ] && [ ! "$FAILSAFE_KVER" ] && Die "Please install mindi-kernel package. You need it.\nGo to http://www.mondorescue.org and download it, then install it."
 
-rm -f $MINDI_CACHE/{*img,*gz,*iso}
-
 PrepareDataDiskImages $MINDI_CACHE
 noof_disks=$?

branches/stable/mindi/rootfs/sbin/init

@@ -523 +523 @@
 openvt 8 /usr/bin/tail -f $LOGFILE
 
+# Log some useful info
+echo "init (from mindi v$MINDI_VER-r${MINDI_REV}" >> $LOGFILE
+echo "/proc/cmdline is:" >> $LOGFILE
+cat /proc/cmdline  >> $LOGFILE
+echo "Start date : `date`" >> $LOGFILE
+echo "df result:" >> $LOGFILE
+echo "----------" >> $LOGFILE
+df >> $LOGFILE
+echo "-------------" >> $LOGFILE
+echo "mount result:" >> $LOGFILE
+echo "-------------" >> $LOGFILE
+mount >> $LOGFILE
+echo "-------------" >> $LOGFILE
+echo "lsmod result:" >> $LOGFILE
+echo "-------------" >> $LOGFILE
+lsmod >> $LOGFILE
+echo "-------------" >> $LOGFILE
+
 #-------------------------------
 #ABSORBENTANDYELLOWANDPOROUSISHE#;# --- don't touch this either :)
 #-------------------------------
-
-lsmod > /tmp/ramdisk-lsmod.txt 2> /dev/null
-cut -d' ' -f1 /tmp/original-lsmod.txt /tmp/original-lsmod.txt /tmp/ramdisk-lsmod.txt | sort | uniq -d > /tmp/missing-modules.txt
-echo "Warning - these modules did not make it onto the ramdisk" >> $LOGFILE
-cat /tmp/missing-modules.txt >> $LOGFILE
 
 #ctrlaltdel soft

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

@@ -2763 +2763 @@
         if (!does_file_exist("/var/cache/mindi/mindi-kern.1722.img"))
 #else
+        /* BERLIOS: To be improved */
         if (!does_file_exist("/var/cache/mindi/mindi-bootroot.1722.img")
             && !does_file_exist("/var/cache/mindi/mindi-boot.1440.img")
             && !does_file_exist("/var/cache/mindi/mindi-boot.2880.img")
-            && !does_file_exist("/var/cache/mindi/mindi-boot.5760.img"))
+            && !does_file_exist("/var/cache/mindi/mindi-boot.5760.img")
+            && !does_file_exist("/var/cache/mindi/mindi-boot.8192.img"))
 #endif
         {

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

@@ -1979 +1979 @@
     log_it("scratchdir = '%s'", bkpinfo->scratchdir);
     log_it("tmpdir = '%s'", bkpinfo->tmpdir);
+    log_it("image_devs = '%s'", bkpinfo->image_devs);
     log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device,
            bkpinfo->boot_loader);

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -2223 +2223 @@
             }
         } else {
-            mr_msg(2,
+            /* BERLIOS : Useless ? */
+            /* That boot image doesn't always exist where the following method always works 
+            log_msg(2,
                     "gcffa --- looking at mounted CD for mindi-boot.2880.img");
-            /* BERLIOS : Useless ?
             mr_asprintf(&command,
                     "mount " MNT_CDROM
@@ -2232 +2233 @@
             mr_asprintf(&mounted_cfgf_path, "%s/%s", mountpt, cfg_file);
             if (!does_file_exist(mounted_cfgf_path)) {
-                mr_msg(2,
-                        "gcffa --- Plan C, a.k.a. untarring some file from all.tar.gz");
+                log_msg(2,
+                        "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
                 mr_asprintf(&command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm"); // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
                 run_program_and_log_output(command, TRUE);