Changeset 2858 in MondoRescue for branches/2.2.9/mindi

Timestamp:

Jul 26, 2011, 1:14:25 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix an issue in test of FindKernel for Xen and non Xen cases

File:

• branches/2.2.9/mindi/mindi (modified) (4 diffs)

branches/2.2.9/mindi/mindi

@@ -2342 +2342 @@
             if echo $i | grep "$KERVERRUN" ; then
                 LogIt "OK, I used my initiative and found that "
-                    LogIt "$i is probably your kernel. "
+                LogIt "$i is probably your kernel. "
                 output="$i"
+                break
             fi
         done
-        if [ -n "$output" ]; then
+        if [ ! -n "$output" ]; then
             if echo " $possible_kernels " | grep -F "/boot/vmlinuz " &> /dev/null ; then
                 output=/boot/vmlinuz
@@ -2366 +2367 @@
         else
             for i in $possible_xenkernels ; do
-                    if echo $i | grep "$KERVERRUN" ; then
+                if echo $i | grep "$KERVERRUN" ; then
                     LogIt "OK, I used my initiative and found that "
-                        LogIt "$i is probably your Xen kernel. "
+                    LogIt "$i is probably your Xen kernel. "
                     xenkernelpath="$i"
+                    break
                 fi
             done
-            if [ -n "$xenkernelpath" ]; then
+            if [ ! -n "$xenkernelpath" ]; then
                 new_possible_xenkernels=`echo "$possible_xenkernels" | tr -s ' ' '\n' | grep -E "^/boot" | sort -u | tr '\n' ' '`
                 if [ ! -n "$new_possible_xenkernels" ]; then
@@ -2378 +2380 @@
                     LogIt "Using $xenkernelpath"
                 else
-                        LogIt "Two or more possible Xen kernels found. You may specify any one of them and the "
+                    LogIt "Two or more possible Xen kernels found. You may specify any one of them and the "
                     LogIt "boot disks will still work, probably. If one does not work, try another."
-                        LogIt "$possible_xenkernels"
+                    LogIt "$possible_xenkernels"
                     echo ""
                     xenkernelpath=`echo $possible_xenkernels | tr -s ' ' '\n' | head -1`
@@ -2896 +2898 @@
             if [ $KERNEL_IS_XEN = "yes" ]; then
                 echo "$xenkernelpath"
+                LogIt "xenkernelpath = $xenkernelpath"
+        fi
                 MindiExit 0
             else