Changeset 2013 in MondoRescue

Timestamp:

Sep 5, 2008, 8:55:11 PM (17 years ago)

Author:

Bruno Cornec

Message:

Fix Labelled swap to support 2.6.12 kernel on FC3 which skip only 16 bytes and not 105 to find the label. May need further fixes for other kernels.

File:

• branches/2.2.7/mindi/mindi (modified) (3 diffs)

branches/2.2.7/mindi/mindi

@@ -916 +916 @@
 partition_size partition_format outstring partition_number \
 partition_mountpt c_p lwm_info psz lvm_dev unofficial_outstring \
-absolute_partition old_partition_fmt current_lvolume
+absolute_partition old_partition_fmt current_lvolume uname skip
 
     echo "Your raw fstab file looks like this:" >> $LOGFILE
@@ -1032 +1032 @@
             # SWAP only
             if [ "x$actual_dev" = "x" -a  _"`echo $current_partition | /bin/grep -iE 'LABEL=SWAP|LABEL=SW-'`" != _"" ]; then
+                    skip=""
+                    uname="`uname -r`"
+                    [ "`echo $uname | grep "2.4.[0-9]"`" != "" ] && skip=16
+                    # 2.6.12 needs 16 (FC3)
+                    [ "`echo $uname | grep "2.6.[0-1]"`" != "" ] && skip=16
+                    # 2.6.19 and upper needs 1052
+                    [ "`echo $uname | grep "2.6.19"`" != "" ] && skip=1052
+                    [ "`echo $uname | grep "2.6.[2-9]"`" != "" ] && skip=1052
+                    if [ $skip = "" ]; then
+                        Die "Your kernel is too old. I don't know how to support labelled swap spaces with it"
+                    fi
                     for try_dev in `tail +2 /proc/swaps | cut -d' ' -f1`
                     do
                         # Location of the swap label for kernel 2.6
-                        try_dev_label=`dd bs=1 count=16 skip=1052 if=$try_dev 2> /dev/null`
+                        try_dev_label=`dd bs=1 count=16 skip=$skip if=$try_dev 2> /dev/null`
                         if [ "x$try_dev_label" = "x$redhat_label" ]; then
                             actual_dev=$try_dev
@@ -1783 +1794 @@
     lines=`grep -vx " *#.*" $lfiles | grep -vx "" | wc -l`
     ParseModprobeForIncludes $includefile
-    lines=${lines}+`wc -l $includefile`
+    lines=$(($lines+`wc -l $includefile`))
     cat $lfiles $includefile | GenerateGiantDependencyList $needlist $lines
     res=$?