Changeset 2615 in MondoRescue for branches

Timestamp:

Apr 7, 2010, 2:17:08 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Adds tee to deplist
• Fix #412 by supporting grub-install.unsupported for OpenSuSE and solving an issue with the parameter passed to grub for device which should be a device name, not a partition.

Location:

branches/2.2.9

Files:

• mindi/deplist.d/base.conf (modified) (1 diff)
• mondo/src/restore-scripts/mondo/grub-MR (modified) (5 diffs)

branches/2.2.9/mindi/deplist.d/base.conf

@@ -55 +55 @@
 /usr/bin/less
 /sbin/ldconfig
+/usr/bin/tee
 
 # For swap uuid support, ia64 and probably then more in the future

branches/2.2.9/mondo/src/restore-scripts/mondo/grub-MR

@@ -69 +69 @@
 
     echo -en "\
-    device (hd$driveno) $mbrpart\n\
+    device (hd$driveno) $mbrdev\n\
     $extraline\n\
     root (hd$driveno,$partno)\n\
@@ -77 +77 @@
     log_file=/tmp/grub.output
     if [ "$MNT_RESTORING" ] ; then
-        chroot /mnt/RESTORING grub --batch < /tmp/feed.txt > $log_file
+        chroot $MNT_RESTORING grub --batch < /tmp/feed.txt > $log_file
     else
         grub --batch < /tmp/feed.txt > $log_file
@@ -104 +104 @@
 
 echo "Now I'll use grub-install" >> $LOGFILE
-chroot /mnt/RESTORING grub-install $1 >> $LOGFILE
-res=$?
+if [ "$MNT_RESTORING" ] ; then
+    chroot $MNT_RESTORING grub-install $1 >> $LOGFILE
+    res=$?
+else
+    grub-install $1 >> $LOGFILE
+    res=$?
+fi
 echo "grub-install returned $res" >> $LOGFILE
 [ "$res" -eq "0" ] && exit 0
 
+# For some OpenSuSE
+echo "Now I'll use grub-install.unsupported" >> $LOGFILE
+if [ "$MNT_RESTORING" ] ; then
+    chroot $MNT_RESTORING grub-install.unsupported $1 >> $LOGFILE
+    res=$?
+else
+    grub-install.unsupported $1 >> $LOGFILE
+    res=$?
+fi
+echo "grub-install.unsupported returned $res" >> $LOGFILE
+[ "$res" -eq "0" ] && exit 0
+
 echo "Trying a hack" >> $LOGFILE
-FindBootPart $1 $2
-mbrpart=$1
+FindBootPart $1 $2 2>&1 | tee -a $LOGFILE
+mbrdev=`echo $1 | sed 's/[^0-9]*\([0-9]*\)$/\1/'`
 if echo $bootpart | grep "/cciss/" > /dev/null ; then
     partno=`basename $bootpart | cut -d'p' -f2`
@@ -117 +134 @@
     partno=`basename $bootpart | cut -d'p' -f3`
 else
-    partno=`basename $bootpart | sed s/[a-z]*//`
+    partno=`basename $bootpart | sed 's/[a-z]*//'`
 fi
 if [ ! "$partno" ] ; then
@@ -125 +142 @@
 fi
 if echo $bootpart | grep "/md" > /dev/null ; then
+    # FIXME: Why this if not used later
     base=`basename $bootpart`
     line=`grep $base /proc/mdstat | head -n1`
-    echo "mbrpart was $mbrpart"
-    mbrpart=`parted2fdisk -l | grep /dev/ | head -n1 | tr ':' ' ' | cut -d' ' -f2`
-    echo "mbrpart is $mbrpart"
+    echo "mbrdev was $mbrdev" 2>&1 | tee -a $LOGFILE
+    mbrdev=`parted2fdisk -l | grep /dev/ | head -n1 | tr ':' ' ' | cut -d' ' -f2`
+    echo "mbrdev is $mbrdev" 2>&1 | tee -a $LOGFILE
     partno="0"; # cheating - FIXME    
 fi
-echo ".............Cool."
+echo ".............Cool." 2>&1 | tee -a $LOGFILE
 
 grub=`FindPathOfRESTExe grub`