Changeset 3310 in MondoRescue

Timestamp:

Jul 3, 2014, 10:24:14 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Remove EXTRA_MODS variable as it was leading to modules missing at restore time. Now part of CDROM_MODS and were anyway loaded 99% of the time.
• Optimize modules list computation between mindi and restore init script.
• As a consequence do not try to relaod modules list twice as there is not difference in modules list anymore, eveything is in the boot part.

Location:

branches/3.2/mindi

Files:

• mindi (modified) (6 diffs)
• rootfs/etc/init.d/rcS (modified) (4 diffs)

branches/3.2/mindi/mindi

@@ -71 +71 @@
 USB_MODS="usb-storage usb_storage usb-ohci usb-uhci input hid uhci_hcd uhci-hcd ehci-hcd ehci-pci ohci-hcd ohci_hcd ohci-pci xhci xhci-hcd usbkbd usbhid keybdev mousedev scsi_mod ff-memless ums_cypress ums-cypress cp210x usbserial"
 NET_MODS="nfs nfsv2 nfsv3 nfsv4 nfsd loop mii 3c59x e100 bcm5700 cnic be2net bnx2 bnx2x bnx2i mdio e1000 e1000e igb dca eepro100 ne2k-pci tg3 pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmxnet3 vmnet exportfs fuse netbk xenblktap r8169 virtio_net via_rhine ipv6 ptp"
-CDROM_MODS="$TAPE_MODS $IDE_MODS $USB_MODS $PCMCIA_MODS $SCSI_MODS $NET_MODS cdrom isocd isofs sg sr_mod iso9660 vfat fat"
-# Those modules will only go on the backup media, not the boot media.
-EXTRA_MODS="$CDROM_MODS loop md-mod lvm-mod dm-mod dm_mod dm-multipath dm-emc dm-hp-sw dm-rdac dm-region-hash multipath jfs xfs btrfs reiserfs ext2 ext3 minix nfs nfsd ext4 ocfs2 configfs vxfs "
+CDROM_MODS="$TAPE_MODS $IDE_MODS $USB_MODS $PCMCIA_MODS $SCSI_MODS $NET_MODS cdrom isocd isofs sg sr_mod iso9660 vfat fat loop md-mod lvm-mod dm-mod dm_mod dm-multipath dm-emc dm-hp-sw dm-rdac dm-region-hash multipath jfs xfs btrfs reiserfs ext2 ext3 minix nfs nfsd ext4 ocfs2 configfs vxfs "
 # Replace with that line for HP OCMP e.g.
 #DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu fdomain"
@@ -818 +816 @@
     for i in $DENY_MODS; do
         module_list=`echo ${module_list} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
-        EXTRA_MODS=`echo ${EXTRA_MODS} | tr ' ' '\n' | grep -Ev "^${i}$" | tr '\n' ' '`
     done
 ###
@@ -833 +830 @@
 ### Sq-Mod End
 ###
-    # Get rid of duplicates, so that if a live kernel module also appears
-    # in $EXTRA_MODS that it won't get reported as "live module file not found" twice.
-    for module in `echo $module_list $EXTRA_MODS | tr ' ' '\n' | sort -u` ; do
+    # Get rid of duplicates
+    for module in `echo $module_list | tr ' ' '\n' | sort -u` ; do
         r=`find /lib/modules/$kern -type f | grep "/${module}\..*o" | tail -n1`
         if [ -z "$r" ]; then
@@ -2631 +2627 @@
         list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
     fi
-    if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ "$USBDEVICE" != "" ]; then
-        list_of_groovy_mods="$list_of_groovy_mods $EXTRA_MODS"
-    fi
     for i in $DENY_MODS; do
         LogFile "INFO: Removing $i from the list of modules to load"
@@ -2723 +2716 @@
         echo -en "$LAST_FILELIST_NUMBER" > $mountpoint/tmp/LAST-FILELIST-NUMBER
     fi
+
+    # Create module list to load at restore time
+    rm -f $mountpoint/tmp/modules
+    for m in $CDROM_MODS; do
+        echo $m >> $mountpoint/tmp/modules
+    done
+
     mkdir -p $mountpoint/proc
     LogFile "---------------------------"
@@ -3018 +3018 @@
 $FDISK -l >> $LOGFILE
 LogFile "----------------"
-LogFile "List of extra modules is:"
-LogFile "$EXTRA_MODS"
-LogFile "-------------"
 
 # Compute libata version

branches/3.2/mindi/rootfs/etc/init.d/rcS

@@ -795 +795 @@
 
     echo "Searching for modules to install..."
-    lismod=`find /lib/modules -name '*\.ko*' -o -name '*\.o*'`
+    if [ ! -e /tmp/modules ]; then
+        LogIt "Unable to find the modules list. Computing one. This may take some time..."
+        lismod=`find /lib/modules -name '*\.ko*' -o -name '*\.o*'`
+        for m in $lismod; do
+            k=`basename $m | sed 's/\.ko.*$//'`
+            j=`basename $k | sed 's/\.o.*$//'`
+            echo "$j" >> /tmp/modules
+        done
+    fi
     # loading forced modules first
-    for m in $lismod; do
-        k=`basename $m | sed 's/\.ko.*$//'`
-        j=`basename $k | sed 's/\.o.*$//'`
+    for j in `cat /tmp/modules`; do
         echo "$FORCE_MODS" | grep -q "$j "
         if [ $? -eq 0 ]; then
@@ -806 +812 @@
         fi
     done
-    for m in $lismod; do
-        k=`basename $m | sed 's/\.ko.*$//'`
-        j=`basename $k | sed 's/\.o.*$//'`
+    for j in `cat /tmp/modules`; do
         echo "$DENY_MODS" | grep -q "$j "
         if [ $? -eq 0 ]; then
@@ -855 +859 @@
     # BCO: test return value
     install-additional-tools
-    # Keep the kernel silent again
-    PKLVL=`cut -f1 /proc/sys/kernel/printk`
-    echo 0 > /proc/sys/kernel/printk
-    ModprobeAllModules
-    echo $PKLVL > /proc/sys/kernel/printk
 
     # Retry failed udev events now that local filesystems are mounted read-write
@@ -882 +881 @@
 export PATH GROOVY USER LOGFILE ARCH
 
-mount -o remount rw /
+mount -o remount,rw /
 rm -f $LOGFILE