Changeset 3111 in MondoRescue for branches/3.0/mindi

Timestamp:

May 5, 2013, 4:55:42 AM (11 years ago)

Author:

Bruno Cornec

Message:

• revert patch 3106-2107 from SVK which had removed good code and fixes !!

Location:

branches/3.0/mindi

Files:

• README.pxe (modified) (2 diffs)
• mindi (modified) (5 diffs)
• rootfs/sbin/start-netfs (modified) (1 diff)

branches/3.0/mindi/README.pxe

@@ -11 +11 @@
 label mondo
         kernel vmlinuz-mondo
-        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=131072 selinux=0 rw root=/dev/ram iso acpi=off apm=off devfs=nomount exec-shield=0 pxe [proto=nfs|sshfs] [prefix=machine] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [hwaddr=M:A:C:A:D:R] [netfsmount=server:mountpoint] [netfsopt=-o option][netfspath=local_path] [ping=#] ...
+        append initrd=initrd-mondo load_ramdisk=1 prompt_ramdisk=0 ramdisk_size=131072 selinux=0 rw root=/dev/ram iso acpi=off apm=off devfs=nomount exec-shield=0 pxe [proto=nfs|sshfs|smbfs] [prefix=machine] [ipconf=(ipdev:ipadr:netmask:broadcast:gateway|ipdev:dhcp)] [hwaddr=M:A:C:A:D:R] [netfsmount=server:mountpoint] [netfsopt=-o option][netfspath=local_path] [ping=#] ...
 
 ipdev is the device name (e.g. eth2)
@@ -20 +20 @@
 dhcp is a keyword. Using it will provide all the previous 4 values to activate the LAN interface.
 hwaddr is the MAC address of the device you want to use to restore through
-proto is the protocol to use for mounting the remote share (default is NFS, sshfs is also available)
+proto is the protocol to use for mounting the remote share (default is NFS, sshfs and smbfs are also available)
 server is the ip addr of the Remote Network server
 mountpoint is the mount point on the Remote Network server to use (if NFS, should be in /etc/exports of the NFS server)

branches/3.0/mindi/mindi

@@ -756 +756 @@
 
     # say where we are.
-    LogFile "INFO:   GetInitrdFilesystemToUse(): called with parameter: $lvKernelImage"
+    LogFile "INFO: GetInitrdFilesystemToUse(): called with parameter: $lvKernelImage"
 
     # verify that file exists
     [ ! -f $lvKernelImage ] && Die "File $lvKernelImage not found. Terminating."
 
-    # Kernel may be gzip compressed
+    # Kernel may be gzip compressed - Case of RHEL5 - SLES11SP1
     file $lvKernelImage 2>&1 | grep -q gzip
     if [ $? -eq 0 ]; then
-        lvScanRes=`gzip -cd $lvKernelImage | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicExt3fs|$lcMagicInitfs"`
-
-        # determine which filesystem to use for initrd image: ext2|3fs, gzip'ed cpio (initramfs) or cramfs
-        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"
-        elif [ `echo $lvScanRes | grep -Ec "$lcMagicCramfs"` -eq 1 ]; then
-            lvUseFilesystem="cramfs"
+        LogFile "INFO: Found a gzip compressed kernel $lvKernelImage"
+        lvScanRes=`gzip -cd $lvKernelImage | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicExt3fs|$lcMagicInitfs" 2> /dev/null`
+    else
+        LogFile "INFO: Found a non gzip compressed kernel $lvKernelImage"
+        # kernel is x86 boot sector in RHEL3/4 with embedded gzip content
+        # get offet of gzip magic "1f8b0800" in file (for these older kernels)
+        lvOffset=`od -vA n -t x1 $lvKernelImage | tr -d '[:space:]' | awk '{ print match($0, "1f8b0800")}' 2> /dev/null`
+        if [ $lvOffset -eq 0 ]; then
+            LogFile "INFO: gzip magic not found in file $lvKernelImage. Supposing initramfs."
+            lvScanRes=$lcMagicInitfs
         else
-            lvUseFilesystem="UNSUPPORTED"
-        fi
-
-    else
-        # In that case, we are after 2.6.30 and use the supported initramfs 
+            lvOffset=`expr $lvOffset / 2`
+            LogFile "INFO: GetInitrdFilesystemToUse(): gzip magic found at lvOffset $lvOffset."
+            # scan again  kernel image
+            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" 2> /dev/null`
+        fi
+    fi
+
+    # determine which filesystem to use for initrd image: ext2|3fs, gzip'ed cpio (initramfs) or cramfs
+    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"
-    fi
+    elif [ `echo $lvScanRes | grep -Ec "$lcMagicCramfs"` -eq 1 ]; then
+        lvUseFilesystem="cramfs"
+    else
+        # In that case, we are most probably after 2.6.30 and use the supported initramfs 
+        LogFile "No automatic detection found previously. Supposing initramfs."
+        LogFile "Report on the MondoRescue mailing-list withyour log files"
+        lvUseFilesystem="initramfs"
+    fi
+
     # say what we are using
-    LogFile "INFO:   GetInitrdFilesystemToUse(): Filesytem to use for initial ram disk is $lvUseFilesystem."
+    LogFile "INFO: GetInitrdFilesystemToUse(): Filesytem to use for initial ram disk is $lvUseFilesystem."
 
     # return file system to use
@@ -922 +937 @@
     file="$1"
 
-    echo $file | grep -q '\.\./'
-    if [ $? -eq 0 ]; then
+    while [ `echo $file | grep -Ec '\.\./'` -ne 0 ]; do
         # We need to normalise the path with .. in it
-        file=`echo $file | perl -pi -e 's|([^/]+)/([^/]+)/\.\./([^/]+)|$1/$3|'`
-    fi
+        file=`echo $file | perl -pi -e 's|([^/]*)/([^/]+)/\.\./([^/]+)|$1/$3|g'`
+    done
     echo "$file"
     if [ ! -h $file ]; then
@@ -1804 +1818 @@
     for i in $options ; do
         ooo=$i
-        [ "$ooo" = "RESTORE" ] && ooo="nuke"
+        [ "$ooo" = "RESTORE" ] && ooo="RESTORE nuke"
         if [ "$type" = "elilo" ]; then
             outstr="image=/vmlinuz\n\tlabel=$i\n\tinitrd=/initrd.img\n\troot=/dev/ram0 append=\" rw ramdisk_size=$ramdisk_size $ooo $MINDI_ADDITIONAL_BOOT_PARAMS \"\n"
@@ -2588 +2602 @@
         fi
     done
-    tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xUf - || LogIt "ERROR: Problem in minimal analysis" $MINDI_TMP/$$.log
+    tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xUf - || LogIt "WARNING: Problem in minimal analysis" $MINDI_TMP/$$.log
 
     # To improve support for distribution scripts, we now prefer to use bash as the std shell. Also fixes #600
@@ -3231 +3245 @@
 
 for i in loop cdrom ide-cd isofs linear raid0 raid1 raid5 ; do
-    modinfo 2> /dev/null 1> /dev/null
+    modinfo $i 2> /dev/null 1> /dev/null
     if [ $? -eq 0 ]; then
         modprobe $i 2>&1 > /dev/null

branches/3.0/mindi/rootfs/sbin/start-netfs

@@ -104 +104 @@
         ln -sf /dev/console /dev/tty
         sshfs -o ro,StrictHostKeyChecking=no $netfsopt $netfsmount /tmp/isodir
+    elif [ "$proto" = "smbfs" ]; then
+        LogIt "Mounting SMBFS share ($netfsmount) on /tmp/isodir..."
+        mount -t cifs $netfsopt $netfsmount /tmp/isodir -o ro 
     elif [ "$proto" != "" ]; then
         if [ -x /sbin/rpcbind ]; then