Changeset 2391 in MondoRescue

Timestamp:

Sep 11, 2009, 3:17:46 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Adds ext3 initrd support for 2.6.30
• Fix a typo in mondorestore

Location:

branches/2.2.10

Files:

• mindi/mindi (modified) (7 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (1 diff)
• tools/quality (modified) (1 diff)

branches/2.2.10/mindi/mindi

@@ -633 +633 @@
     local lcMagicCramfs="<3>cramfs: wrong magic"
     local lcMagicExt2fs="EXT2-fs: blocksize too small for device."
+    local lcMagicExt3fs="<3>EXT3-fs: blocksize too small for journal device."
     local lcMagicInitfs="<6>checking if image is initramfs...|<6>Unpacking initramfs...|<6>Trying to unpack rootfs image as
 initramfs"
@@ -650 +651 @@
     file $lvKernelImage 2>&1 | grep -q gzip
     if [ $? -eq 0 ]; then
-        lvScanRes=`gzip -cd $lvKernelImage | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicInitfs"`
+        lvScanRes=`gzip -cd $lvKernelImage | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicExt3fs|$lcMagicInitfs"`
     else
         # get offet of gzip magic "1f8b0800" in file
@@ -659 +660 @@
 
         # scan kernel image for initrd filessystem support
-        lvScanRes=`dd ibs=1 skip=$lvOffset if=$lvKernelImage obs=1M 2>/dev/null | gunzip -c 2> /dev/null | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicInitfs"`
+        lvScanRes=`dd ibs=1 skip=$lvOffset if=$lvKernelImage obs=1M 2>/dev/null | gunzip -c 2> /dev/null | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicExt3fs|$lcMagicInitfs"`
     fi
 
@@ -665 +666 @@
     if [ `echo $lvScanRes | grep -Ec "$lcMagicExt2fs"` -eq 1 ]; then
         lvUseFilesystem="ext2fs"
+    elif [ `echo $lvScanRes | grep -Ec "$lcMagicExt3fs"` -eq 1 ]; then
+        lvUseFilesystem="ext3fs"
     elif [ `echo $lvScanRes | grep -Ec "$lcMagicInitfs"` -eq 1 ]; then
         lvUseFilesystem="initramfs"
@@ -2404 +2407 @@
     gvFileSystem=`GetInitrdFilesystemToUse ${kernelpath}`
     [ -z  gvFileSystem ] && Die "GetFilesystemToUse() failed. Terminating."
-    case "$gvFileSystem" in
-    "ext2fs")
+    if [ "$gvFileSystem" = "ext2fs" ] || [ "$gvFileSystem" = "ext3fs" ]; then
         # say what will be used
-        LogFile "Creating an ext2 initrd image..." 
+        LogFile "Creating an $gvFileSystem initrd image..."
         # kernel expects linuxrc in ext2 filesystem
         ( cd $mountpoint && ln -sf sbin/init linuxrc )
@@ -2419 +2421 @@
         # log that we are done
         LogFile "...done." 
-    ;;
-    "initramfs")
+    elif [ "$gvFileSystem" = "initramfs" ]; then
         # say what will be used
         LogFile "Creating a gzip'ed cpio (AKA initramfs) initrd image..." 
@@ -2435 +2436 @@
         # log that we are done
         LogFile "...done." 
-    ;;
-    *)
+    else
         Die "Filesystem $gvFileSystem not supported for initrd image. Terminating."
-    ;;
-    esac
+    fi
+
     if [ "$res" -eq "0" ] ; then
         echo -en "..."

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -878 +878 @@
     if (retval) {
         log_to_screen("Errors occurred during the nuke phase.");
-    } else if (tmp1, "RESTORE")) {
+    } else if (strstr(tmp1, "RESTORE")) {
         log_to_screen("PC was restored successfully. Thank you for using Mondo Rescue.");
         log_to_screen("Please visit our website at http://www.mondorescue.org for more information.");

branches/2.2.10/tools/quality

@@ -28 +28 @@
 
 # How many sprintf/strcat/strcpy vs asprintf are they
-for s in asprintf mr_asprintf sprintf snprintf strcat strncat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline ARBITRARY_MAXIMUM MAX_TAPECATALOG_ENTRIES MAX_MOUNTLIST_ENTRIES MAXIMUM_RAID_DEVS MAXIMUM_ADDITIONAL_RAID_VARS MAXIMUM_DISKS_PER_RAID_DEV MAX_TAPECAT_FNAME_LEN MAX_NOOF_MEDIA MAX_NEWT_COMMENT_LEN MAX_NOOF_SETS_HERE MAX_STR_LEN getcwd goto free mr_free paranoid_free paranoid_system mr_system assert; do
+for s in asprintf mr_asprintf sprintf snprintf strcat strncat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline ARBITRARY_MAXIMUM MAX_TAPECATALOG_ENTRIES MAX_MOUNTLIST_ENTRIES MAXIMUM_RAID_DEVS MAXIMUM_ADDITIONAL_RAID_VARS MAXIMUM_DISKS_PER_RAID_DEV MAX_TAPECAT_FNAME_LEN MAX_NOOF_MEDIA MAX_NEWT_COMMENT_LEN MAX_NOOF_SETS_HERE MAX_STR_LEN getcwd goto free mr_free paranoid_free paranoid_system mr_system assert static; do
     echo "mondorescue $s usage : "
     tot=0