Changeset 1721 in MondoRescue for branches/2.2.5

Timestamp:

Oct 28, 2007, 5:00:12 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Handles dynamically linked busybox (in case we want to use it soon ;-)
• Adds fixed devices to create for udev
• ide-generic should not be part of the initrd when using libata v2
• support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia64)

Location:

branches/2.2.5/mindi

Files:

• mindi (modified) (8 diffs)
• rootfs/etc/udev-links.conf (modified) (1 diff)

branches/2.2.5/mindi/mindi

@@ -1170 +1170 @@
     
     echo -en "for outerloop in 1 2 3 4 5 ; do\necho -en \".\"\n" >> $outfile
-    # BERLIOS: That code is duplicated - Should be done once only
     list_to_echo="$MODULES"
     # Remove unwanted modules from list
@@ -1184 +1183 @@
         infile="/etc/modules.conf"
     fi
+
+    # Compute libata version
+    laver=`modinfo libata | grep Version | cut -d: -f2 | cut -d. -f1`
+
     for module in $list_to_echo $EXTRA_MODS ; do
+        # If libata v2 is used then remove ide-generic as it will perturbate boot
+        if [ "$module" = "ide-generic" ] && [ `echo "$MODULES" | grep -q libata` ] && [ $laver -ge 2 ]; then
+            continue
+        fi
         params=`sed -n "s/^options \\+$module \\+//p" $infile`
         modpaths=`FindSpecificModuleInPath $searchpath $module`
@@ -1724 +1731 @@
     echo -en "."
     echo "Unmounting $USBDEVICE just in case" >> $LOGFILE
-    umount $USBPART 2>&1 >> $LOGFILE
+    umount $USBPART 2>> $LOGFILE 1>> $LOGFILE
     echo "Erasing $USBDEVICE" >> $LOGFILE
-    $FDISK $USBDEVICE 2>&1 >> $LOGFILE << EOF
+    $FDISK $USBDEVICE 2>> $LOGFILE 1>> $LOGFILE << EOF
 d
 d
@@ -1797 +1804 @@
     cd $old_pwd
     echo -en "."
+    umount $MINDI_TMP/usb
     if [ "$ARCH" != "ia64" ] ; then
-        umount $MINDI_TMP/usb
         syslinux $USBPART 2>> $MINDI_TMP/syslinux.log
         if [ "$?" -ne "0" ] ; then
@@ -1811 +1818 @@
     else
         echo "No USB boot support for ia64" | tee -a $LOGFILE
-        umount $MINDI_TMP/usb
         MindiExit -1
     fi
@@ -2392 +2398 @@
         incoming=`echo "$incoming" | awk '{if (match($1,/\//)) {print $1} else {if (match($3,/\//)) print $3} fi}'`
         for f in $incoming ; do
-            echo "$f `ReadAllLink $f`"
+            echo "$f"
+            echo "`ReadAllLink $f`"
         done
         read incoming
@@ -2771 +2778 @@
         if [ -x /sbin/udevd ]; then
             LocateDeps /sbin/udevd > $MINDI_TMP/udev.lis
-            cp -a /sbin/udevd sbin
+            cp --parents -Rdf /sbin/udevd `sort -u $MINDI_TMP/udev.lis` .
+            rm -f $MINDI_TMP/udev.lis
         else
             echo "udevd daemon not in standard place (/sbin)" 2>&1 | tee -a $LOGFILE
@@ -2789 +2797 @@
 
     cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null
+
+    # Handle the case where busybox is dynamically linked
+    file $MINDI_LIB/rootfs/bin/busybox 2>&1 | grep -q "dynamically" 
+    if [ $? -eq 0 ]; then
+        LocateDeps $MINDI_LIB/rootfs/bin/busybox > $MINDI_TMP/busy.lis
+        cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
+        rm -f $MINDI_TMP/busy.lis
+    fi
     cd $old_pwd
     echo -en "..."

branches/2.2.5/mindi/rootfs/etc/udev-links.conf

@@ -40 +40 @@
 M nvidiactl c 195 255
 
+# Addition for mindi
+M tty1      c 104 1
+M tty2      c 104 2
+M tty3      c 104 3
+M tty4      c 104 4
+M tty5      c 104 5
+M tty6      c 104 6
+M tty7      c 104 7
+M tty8      c 104 8
+
+M null      c   1 3