Changeset 1815 in MondoRescue

Timestamp:

Nov 19, 2007, 1:13:50 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Increase BOOT_SIZE and EXTRA_SIZE to support features such as HW recovery
• Handles udev.files files which could be symlinks
• Improve udev support for distro with compressed modules (mdv e.g.)
• Fix modules.dep copy
• /sbin/pam_console_apply is needed by mdv udev conf
• Adds support for nohw boot option to avoid re-setuping the HW conf

Location:

branches/2.2.5/mindi

Files:

• README.bkphw (modified) (1 diff)
• mindi (modified) (6 diffs)
• rootfs/sbin/init (modified) (4 diffs)
• udev.files (modified) (1 diff)

branches/2.2.5/mindi/README.bkphw

@@ -27 +27 @@
 echo /usr/local/lib >> /etc/ld.so.conf
 ldconfig
-perl -pi -e 's~^HOME=.*~HOME="/usr/local/bin"~' /usr/local/bin/cpqacuxe
-sed -i -e '/LD_LIBRARY_PATH/d' /usr/local/bin/cpqacuxe
-
-You also may have to remove the LD_ASSUME_KERNEL line in that script.
 
 You're now ready to check your configuration by running mindi-bkphw.

branches/2.2.5/mindi/mindi

@@ -40 +40 @@
 TMPDIR=/tmp
 
-EXTRA_SPACE=24576         ; # increase if you run out of ramdisk space
-BOOT_SIZE=8192       ;      # size of the boot disk
+EXTRA_SPACE=32768         ; # increase if you run out of ramdisk space
+BOOT_SIZE=16384       ;      # size of the boot disk
 MAX_DISKS=99
 WRITE_BOOT_FLOPPIES="yes" ; # do you want to be propted to write floppy images
@@ -665 +665 @@
     fi
     modpaths=`find $1 -name $2.*o -type f`
-    [ "$?" -ne "0" ] && Die "find $1 -name $2.o -type f --- failed"
+    #[ "$?" -ne "0" ] && Die "find $1 -name $2.o -type f --- failed"
     [ "$modpaths" = "" ] && modpaths=`find $1 -name $2.o.gz -type f`
     [ "$modpaths" = "" ] && modpaths=`find $1 -name $2.ko.gz -type f`
@@ -2830 +2830 @@
             lis=""
             # Get only the files which exist in that list
+            # and potentially their symlink structure
             for i in $lis2; do
-                if [ -f $i ]; then
+                if [ -h $i ]; then
+                    j=$i
+                    while [ -h $j ]; do
+                        lis="$lis $j"
+                        j=`readlink $j`
+                    done
+                    lis="$lis $j"
+                elif [ -f $i ]; then
                     lis="$lis $i"
                 fi
@@ -2930 +2938 @@
         echo "Adding $i ($s KB) to the rootfs" >> $LOGFILE
         cp --parents -pdf $i $mountpoint 2>/dev/null || LogIt "Unable to copy $i to $mountpoint"
-        if [ "`echo "$i" | grep -F ".gz"`" ]; then
+        # Uncompress modules if not useing udev and native modprobe
+        if [ ! -f $mountpoint/tmp/USE-UDEV ]; then
+            if [ "`echo "$i" | grep -F ".gz"`" ]; then
                 gunzip -f $mountpoint/$i
-                i=`echo $i | sed 's/.gz//'`
-        fi
-        [ "`echo "$i" | grep -F ".gz"`" ] && gunzip -f $mountpoint/`basename $i`
-    done
+                #i=`echo $i | sed 's/.gz//'`
+            fi
+        fi
+    done
+
+    # Also copy modules.dep in case of udev so that normal modprobe works
+    cp --parents -pdf /$floppy_modules_path/modules.dep $mountpoint 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint"
+
     # For all modules supported, create symlinks under the mountpoint
     for i in $EXTRA_MODS $NET_MODS $SCSI_MODS; do
-        all_modules="$all_modules `FindSpecificModuleInPath $floppy_modules_path $i`"
+        all_modules="$all_modules `FindSpecificModuleInPath $mountpoint $i`"
     done
     for i in $all_modules; do
+        j=`echo $i | sed 's~^$mountpoint/~~'`
         (cd $mountpoint ; ln -s $i . 2>/dev/null)
     done
-    # Also copy modules.dep in case of udev so that normal modprobe works
-    p=`echo $i | cut -d/ -f1-3`
-    cp -df $p/modules.dep $mountpoint/$p 2>/dev/null || LogIt "Unable to copy modules.dep to $mountpoint"
     if [ ! -e "/sbin/devfsd" ] || [ "$disksize" -lt "2880" ] || [ "$kernelpath" = "$MINDI_LIB/vmlinuz" ] ; then
         echo "Deleting devfsd daemon from ramdisk" >> $LOGFILE
@@ -3273 +3285 @@
         export MONDO_SHARE=""
         MindiExit $?
+    elif [ "$1" = "--readalllink" ] ; then
+        [ ! "$2" ] && Die "Please specify the binary to look at"
+        ReadAllLink $2
+        # Avoids logfile content for mondo
+        export MONDO_SHARE=""
+        MindiExit $?
     elif [ "$1" = "--makemountlist" ] ; then
         [ ! "$2" ] && Die "Please specify the output file"
@@ -3494 +3512 @@
                 LogIt "WARNING - failed to create 2.88MB floppy disk image."
                 LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
-                PrepareBootDiskImage_SYSLINUX $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
+                PrepareBootDiskImage_SYSLINUX $CACHE_LOC $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create $BOOT_SIZE kB floppy disk image."
             fi
         fi

branches/2.2.5/mindi/rootfs/sbin/init

@@ -196 +196 @@
 #   Load the VIA IDE module first thing if it exists (requires ide-core).
 #   This is to ensure that DMA is working for VIA chipsets with 2.6 kernels.
-    for module in /ide-core.ko /via82cxxx.ko; do
+    for module in /ide-core.ko* /via82cxxx.ko*; do
         [ -f "$module" ] && MyInsmod $module > /dev/null 2> /dev/null
     done
@@ -315 +315 @@
     answer="NO"
 
+    grep -q nohw /proc/cmdline
+    if [ "$?" -eq 0 ]; then
+        return
+    fi
     if [ -x ./mindi-rsthw ]; then
         grep -q RESTORE /proc/cmdline
         if [ "$?" -ne 0 ]; then
-            clear
+            #clear
             echo "*********************************************************************"
             echo "Do you want to restore the HW configuration of the original machine ?"
@@ -362 +366 @@
 [ -d /proc/bus/usb ] && ! grep -q /proc/bus/usb /proc/mounts && mount -t usbfs none /proc/bus/usb
 if [ -e "/tmp/USE-UDEV" ] ; then
-    if [ -f usbhid.ko ]; then
+    if [ -f usbhid.ko || -f usbhid.ko.gz ]; then
         modprobe -q usbhid
     fi
-    if [ -f uhcd_hci.ko ]; then
+    if [ -f uhcd_hci.ko || -f uhcd_hci.ko.gz ]; then
         modprobe -q uhcd_hci
     fi
 else
     if [ -f uhcd_hci.ko ]; then
-        insmod uhcd_hci.ko
+        insmod uhcd_hci.ko*
     fi
     if [ -f usbhid.ko ]; then
-        insmod usbcore.ko
-        insmod usbhid.ko
+        insmod usbcore.ko*
+        insmod usbhid.ko*
     fi
 fi
@@ -538 +542 @@
 ModprobeAllModules() {
 
-    for m in *.ko; do
-        j=`echo $m | sed 's/\.ko$//'`
-        if [ -e $j ]; then
-            modprobe -q $j
-        fi
+    for m in *.ko*; do
+        j=`echo $m | sed 's/\.ko.*$//'`
+        modprobe -q $j
     done
 }

branches/2.2.5/mindi/udev.files

@@ -13 +13 @@
 /sbin/udevcontrol
 /sbin/udevtrigger
+/sbin/pam_console_apply