Changeset 1062 in MondoRescue

Timestamp:

Jan 18, 2007, 2:57:08 PM (18 years ago)

Author:

andree

Message:

Add script for finding distribution specific FAILSAFE kernel and add
hooks for calling it to mindi.
(Merge Debian enhancement into mainstream.)

Location:

branches/stable/mindi

Files:

• distributions/debian/FindDistroFailsafe (added)
• mindi (modified) (2 diffs)

branches/stable/mindi/mindi

@@ -2722 +2722 @@
 fi
 
-[ -f "$MINDI_LIB/vmlinuz" ] && FAILSAFE_KVER=`strings $MINDI_LIB/vmlinuz 2> /dev/null | grep -E "2\.[46]" | cut -d' ' -f1`
+# If we have a distribution-specific script for finding a FAILSAFE kernel, use it.
+if [ -f "$MINDI_LIB/FindDistroFailsafe" ] && [ ! "$1" = "--makemountlist" ] && [ "$kernelpath" = "FAILSAFE" ]; then
+    source $MINDI_LIB/FindDistroFailsafe
+    # Log kernel image
+    LogIt "FAILSAFE kernel image to be used is: $FAILSAFE_KBIN ($FAILSAFE_KVER)"
+else
+    [ -f "$MINDI_LIB/vmlinuz" ] && FAILSAFE_KVER=`strings $MINDI_LIB/vmlinuz 2> /dev/null | grep -E "2\.[46]" | cut -d' ' -f1`
+fi
 
 if ! which mkfs.vfat &> /dev/null ; then
@@ -2961 +2968 @@
 fi
 if [ "$YOUR_KERNEL_SUCKS" != "" ] || [ "$kernelpath" = "" ] || [ "$kernelpath" = "SUCKS" ] || [ "$kernelpath" = "FAILSAFE" ] ; then
-    kernelpath=$MINDI_LIB/vmlinuz
-    LogIt "I shall include Mindi's failsafe kernel, not your kernel, in the boot disks."
-    LogIt "However, you are still running your kernel. If Mindi fails to create your"
-    LogIt "disks then it may still be a result of a problem with your kernel."
-    pwd=`pwd`
-    cd $MINDI_TMP
-    bzip2 -dc $MINDI_LIB/lib.tar.bz2 | tar -x || Die "Cannot unzip lib.tar.bz2"
-    cd $pwd
+    # If we have a distribution-specific script for finding a FAILSAFE kernel, use it.
+    if [ -f "$MINDI_LIB/FindDistroFailsafe" ] && [ ! "$1" = "--makemountlist" ]; then
+        source $MINDI_LIB/FindDistroFailsafe
+        # Log kernel image
+        LogIt "FAILSAFE kernel image to be used is: $FAILSAFE_KBIN ($FAILSAFE_KVER)"
+        kernelpath="$FAILSAFE_KBIN"
+        LogIt "I shall include a failsafe kernel, not your kernel, in the boot disks.\n"
+        LogIt "The failsafe kernel is $kernelpath.\n"
+        LogIt "However, you are still running your kernel. If Mindi fails to create your\n"
+        LogIt "disks then it may still be a result of a problem with your kernel.\n"
+        pwd=`pwd`
+        cd $TMP_ROOT
+        mkdir -p lib/modules
+        cp -a "/lib/modules/$FAILSAFE_KVER" "lib/modules/$FAILSAFE_KVER" || Die "Cannot copy kernel modules."
+        cd $pwd
+    else
+        kernelpath=$MINDI_LIB/vmlinuz
+        LogIt "I shall include Mindi's failsafe kernel, not your kernel, in the boot disks."
+        LogIt "However, you are still running your kernel. If Mindi fails to create your"
+        LogIt "disks then it may still be a result of a problem with your kernel."
+        pwd=`pwd`
+        cd $MINDI_TMP
+        bzip2 -dc $MINDI_LIB/lib.tar.bz2 | tar -x || Die "Cannot unzip lib.tar.bz2"
+        cd $pwd
+    fi
     YOUR_KERNEL_SUCKS="Your kernel sucks"
 fi