Changeset 3561 in MondoRescue

Timestamp:

Apr 11, 2016, 6:12:30 PM (8 years ago)

Author:

Bruno Cornec

Message:

Backports from 3.0 future and 3.2:

• Adds support for the hpvsa driver
• Fix #724 by adding ehci-pci support in USB_MODS
• Adds support for ohci-hcd and ohci_hcd
• Fix a keyboard detection bug (wrong directory added /usr/share)
• Fix keyboard support on Fedora 19 (no conf file found so used the X11 one)
• Fix kernel detection on 3.9+ where the message was lacking <> around the 6
• Fix #753 by forcing LV creation which on RHEL7 now asks a question in case something was already there before.

Location:

branches/3.0-mindi-2.1

Files:

• . (copied) (copied from branches/3.0 )
• mindi/analyze-my-lvm (modified) (1 diff)
• mindi/deplist.d/minimal.conf (modified) (1 diff)
• mindi/mindi (modified) (23 diffs)

branches/3.0-mindi-2.1/mindi/analyze-my-lvm

@@ -75 +75 @@
     fi
 
-    echo "# $LVMCMD lvcreate$params -n $logical_volume $volume_group"
+    echo "# $LVMCMD echo y | lvcreate$params -n $logical_volume $volume_group"
 }
 

branches/3.0-mindi-2.1/mindi/deplist.d/minimal.conf

@@ -116 +116 @@
 /etc/conf.modules
 /etc/modules.conf.local
+/etc/depmod.d/hpvsa.conf
 # Debian 7
 /bin/kmod

branches/3.0-mindi-2.1/mindi/mindi

@@ -39 +39 @@
 TMPDIR=/tmp
 
-EXTRA_SPACE=120000      # increase if you run out of ramdisk space
-BOOT_SIZE=65600         # size of the boot disk
+EXTRA_SPACE=140000      # increase if you run out of ramdisk space
+BOOT_SIZE=75600         # size of the boot disk
 
 PROMPT_MAKE_CD_IMAGE="yes"
@@ -62 +62 @@
 MY_FSTAB=/etc/fstab
 TAPE_MODS="ht st osst ide-tape ide_tape"
-SCSI_MODS="3w-xxxx 3w_xxxx 3w_9xxx 3w-9xxx 53c7,8xx a100u2w a320raid aacraid adpahci advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc hpsa dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi be2iscsi cxgb3i cxgb3 cxgb4i cxgb4 libcxgbi iscsi_boot_sysfs iscsi_target_mod iscsi_tcp libiscsi libiscsi2 scsi_transport_iscsi scsi_transport_iscsi2 libiscsi_tcp uio isp megaraid megaraid_mm megaraid_mbox megaraid_sas mega_sr mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2400 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp qlogicfas qlogicfas408 raw1394 scsi_mod scsi_transport_sas scsi_transport_spi scsi_transport_fc sd_mod crc_t10dif crc-t10dif seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule scsi_dh scsi_tgt emcpdm emcpgpx emcpmpx emcp scsi_dh_emc scsi_dh_alua dc395x diskdumplib scsi_dump_register arcmsr"
+SCSI_MODS="3w-xxxx 3w_xxxx 3w_9xxx 3w-9xxx 53c7,8xx a100u2w a320raid aacraid adpahci advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc hpsa hpvsa dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi be2iscsi cxgb3i cxgb3 cxgb4i cxgb4 libcxgbi iscsi_boot_sysfs iscsi_target_mod iscsi_tcp libiscsi libiscsi2 scsi_transport_iscsi scsi_transport_iscsi2 libiscsi_tcp uio isp megaraid megaraid_mm megaraid_mbox megaraid_sas mega_sr mptbase mptscsih mptsas mptspi mptfc mptscsi mptctl NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qla2400 qla2xxx qla2xxx_conf qlogicfas qlogicfc qlogicisp qlogicfas qlogicfas408 raw1394 scsi_mod scsi_transport_sas scsi_transport_spi scsi_transport_fc sd_mod crc_t10dif crc-t10dif seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs intermodule scsi_dh scsi_tgt emcpdm emcpgpx emcpmpx emcp scsi_dh_emc scsi_dh_alua dc395x diskdumplib scsi_dump_register arcmsr"
 
 # ide-probe-mod
-IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide_cd_mod ide-cd_mod ide-cs ide-core ide_core ide-gd_mod ide_gd_mod edd paride ata_generic ide_pci_generic ata_piix libata dock via82cxxx generic nvidia ahci libahci sata_nv cmd64x pata_via pata_amd pata_marvell pata_serverworks pata_sis pata_sil680 pata_jmicron pata_atiixp pata_acpi amd74xx sis5513 jmicron sata_promise sata_via serverworks sata_svw blkbk virtio virtio_ring virtio_pci virtio_blk virtio_balloon"
+IDE_MODS="ide ide-floppy floppy ide-generic ide-detect ide-mod ide-disk ide_disk ide-cd ide_cd ide_cd_mod ide-cd_mod ide-cs ide-core ide_core ide-gd_mod ide_gd_mod edd paride ata_generic ide_pci_generic ata_piix libata dock via82cxxx generic nvidia ahci libahci sata_nv cmd64x pata_via pata_amd pata_marvell pata_serverworks pata_sis pata_sil680 pata_jmicron pata_atiixp pata_acpi amd74xx sis5513 jmicron sata_promise sata_via serverworks sata_svw blkbk virtio virtio_ring virtio_pci virtio_blk virtio_balloon hv_storvsc"
 PCMCIA_MODS="pcmcia_core ds yenta_socket"
-USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_common usb-common usb_storage input hid hid_generic uhci_hcd ehci_hcd uhci-hcd ehci-hcd ohci-hcd ohci_hcd xhci usbkbd usbhid keybdev mousedev libusual scsi_mod ff-memless ums_cypress ums-cypress cp210x usbserial"
+USB_MODS="usb-storage usb-ohci usb-uhci usbcore usb_common usb-common usb_storage input hid hid_generic uhci_hcd ehci-hcd uhci-hcd ehci-pci ohci-hcd ohci_hcd ohci-pci xhci xhci-hcd usbkbd usbhid keybdev mousedev libusual scsi_mod ff-memless ums_cypress ums-cypress cp210x usbserial"
 NET_MODS="auth_rpcgss sunrpc nfs nfs_acl lockd fscache loop mii 3c59x e100 bcm5700 cnic be2net 8021q bnx2 bnx2x bnx2i mdio e1000 e1000e igb dca eepro100 ne2k-pci tg3 libphy pcnet32 8139cp 8139too 8390 forcedeth vmxnet vmxnet3 vmnet exportfs fuse crc32c libcrc32c netbk xenblktap r8169 virtio_net via_rhine garp lzo lzo_decompress lzo_compress ipv6 ptp_pch"
 CDROM_MODS="$TAPE_MODS $IDE_MODS $USB_MODS $PCMCIA_MODS $SCSI_MODS $NET_MODS af_packet cdrom isocd isofs inflate_fs nls_iso8859-1 nls_base nls_cp437 nls_utf8 sg sr_mod zlib_inflate iso9660 vfat fat"
@@ -373 +373 @@
     local r res mapfile mappath included_item included_list keyfile mp locale
     LogAll "INFO: Analyzing your keyboard's configuration."
-    KEYDIR=/lib/kbd
+    KEYDIR=/usr/lib/kbd
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd     # Slackware
-    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/lib/kbd
-    [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share
-    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole
-    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole-setup
+    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/console
+    [ ! -e "$KEYDIR" ] && KEYDIR=/etc/console-setup
+    [ ! -e "$KEYDIR" ] && KEYDIR=/lib/kbd
     if [ ! -e "$KEYDIR" ] ; then
         LogAll "WARNING: Keyboard mapping directory not found. I shall use default map at boot-time."
@@ -386 +385 @@
         LogFile "INFO: Red Hat-style config detected."
         keyfile=/etc/sysconfig/keyboard
+    elif [ -e "/etc/vconsole.conf" ] ; then
+        LogFile "INFO: New Fedora style config detected."
+        keyfile=/etc/vconsole.conf
     elif [ -e "/etc/rc.d/rc.keymap" ] ; then
         LogFile "INFO: Slackware-style config detected."
@@ -423 +425 @@
         LogFile "INFO: Gentoo-style config detected."
         keyfile=/etc/conf.d/keymaps
+    elif [ -e "/etc/X11/xorg.conf.d/00-keyboard.conf" ] ; then
+        LogFile "INFO: X11-style config detected."
+        keyfile=/etc/X11/xorg.conf.d/00-keyboard.conf
     else
         LogFile "Searching for rc.config ..."
@@ -441 +446 @@
     locale=`grep -F KEYTABLE "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2 | sed 's/.map.gz$//'`
     [ ! "$locale" ] && locale=`grep '.map$' "$keyfile" | sed 's/^.* //'`        # Slackware
-    [ ! "$locale" ] && locale=`grep -E '^KEYMAP=' "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2`     # Gentoo & ArchLinux
+    [ ! "$locale" ] && locale=`grep -E '^KEYMAP=' "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2`     # Gentoo, ArchLinux & New fedora
+    [ ! "$locale" ] && locale=`grep -E 'XkbLayout' "$keyfile" | grep -v '^#' | awk '{print $3}' | tr -d '"'`        #  Fedora 19
     LogFile "INFO: locale=$locale"
     #
@@ -550 +556 @@
 #       LogFile "INFO: '$incoming' generates filelist '$filelist'"
         for fname in $filelist ; do
-            [ "$fname" != "" ] && echo "$fname" >> $tempfile
+            [ "$fname" != "" ] && echo "$fname" >> $tempfile
         done
         progress=$(($progress+1))
@@ -707 +713 @@
     local lcMagicExt2fs="EXT2-fs: blocksize too small for device."
     local lcMagicExt3fs="<3>EXT3-fs: blocksize too small for journal device."
-    local lcMagicInitfs="<6>checking if image is initramfs...|<6>Unpacking initramfs...|<6>Trying to unpack rootfs image as initramfs"
+    local lcMagicInitfs="<6>checking if image is initramfs...|[<]*6[>]*Unpacking initramfs...|[<]*6[>]*Trying to unpack rootfs image as initramfs"
 
     # local variables
@@ -869 +875 @@
                 LogFile "          This warning only affects you if you are using LVM."
                 if echo "$MODULES" | grep lvm &> /dev/null ; then
-                    LogFile "          I think you are, so please take heed!"
+                    LogFile "          I think you are, so please take heed!"
                 else
-                    LogFile "          I don't think you are, so don't worry about it."
+                    LogFile "          I don't think you are, so don't worry about it."
                 fi
             fi
@@ -891 +897 @@
     while [ `echo $file | grep -Ec '\.\./'` -ne 0 ]; do
         # We need to normalise the path with .. in it
-        file=`echo $file | perl -pi -e 's|([^/]*)/([^/]+)/\.\./([^/]+)|$1/$3|g'`
+        file=`echo $file | perl -p -e 's|([^/]*)/([^/]+)/\.\./([^/]+)|$1/$3|g'`
     done
     echo "$file"
@@ -1726 +1732 @@
             if [ -e "$MINDI_TMP/NETFS-DEV" ] ; then
                 echo -en "Press <enter> to continue.\n"
+                echo -en "$BOOT_MEDIA_MESSAGE"
             elif [ ! "$MINDI_TMP" ] ; then
                 echo -en "FYI, this is _not_ a Mondo Rescue CD.\n"
@@ -2137 +2144 @@
         Die "You have $res files present in dependency list\nbut absent from filesystem."
     fi
-    FindAndAddUserKeyboardMappingFile
     mkdir -p $bigdir/tmp
     if [ _"$MONDO_SHARE" != _"" ]; then
@@ -2143 +2149 @@
         cp -f $MINDI_TMP/mondo-restore.cfg $bigdir/tmp &> /dev/null
     fi
+
+    # Needs to be done after the MRCFG creation
+    FindAndAddUserKeyboardMappingFile
+
     [ -d "/mnt/.boot.d" ] && echo "GENTOO" > $bigdir/tmp/DUMBASS-GENTOO
     DropOptimizedLibraries $needlist $bigdir
@@ -2351 +2361 @@
         if [ "$?" -eq "0" ] ; then
             # Used by ia64
-            fkern_ver=`gzip -cd $fname | strings 2> /dev/null | grep -E '[2-9]+[.][0-9]+[.][0-9]+[^\@]*@'`
+            fkern_ver=`gzip -cd $fname | strings 2> /dev/null | grep -E "[2-9]+\.[0-9]+\.[0-9]+[^\@]*@"`
         else
-            fkern_ver=`strings $fname 2> /dev/null | grep -E '[2-9]+[.][0-9]+[.][0-9]+[^\@]*@'`
+            fkern_ver=`strings $fname 2> /dev/null | grep -E "[2-9]+\.[0-9]+\.[0-9]+[^\@]*@"`
         fi
         echo "$fkern_ver"
@@ -2552 +2562 @@
     
     # Copy of files mandatory for ssh to automate mount if sshfs is used
-    mkdir $mountpoint/.ssh
-    cp -rp ~root/.ssh/* $mountpoint/.ssh 2> /dev/null
-    echo > $mountpoint/tmp/myssh << EOF
+    mkdir -p $mountpoint/.ssh $mountpoint/tmp
+    cp -a ~root/.ssh/* $mountpoint/.ssh 2> /dev/null
+    cat > $mountpoint/tmp/myssh << EOF
 ssh -o StrictHostKeyChecking=no $*
 EOF
@@ -2560 +2570 @@
 
     # Copy of files mandatory for ld.so
-    cp -rp /etc/ld.so.c* $mountpoint/etc
+    cp -a /etc/ld.so.c* $mountpoint/etc
 
     # Handle the case where busybox and mount are dynamically linked
@@ -2569 +2579 @@
     fi
 
-    # Copy of files from the minimal env needed as per the deplist.d/minimal.conf file (which includes all busybox deps)
+    # Copy of files from the minimal env needed as per the deplist.d/minimal.conf & udev.conf file (which includes all busybox deps)
     rm -f $MINDI_TMP/minimal.lis $MINDI_TMP/minimal2.lis
-    for f in `grep -v " *#.*" $DEPLIST_DIR/minimal.conf | sort -u`; do
-        if [ -r $f ]; then
-            echo $f >> $MINDI_TMP/minimal.lis
-            LocateDeps $f >> $MINDI_TMP/minimal2.lis
+    for f in `cat $DEPLIST_DIR/minimal.conf $DEPLIST_DIR/udev.conf | grep -vE " *#.*|^#" | sort -u` ; do
+        if [ -d $f ]; then
+            for g in `find $f`; do 
+                echo $g >> $MINDI_TMP/minimal.lis
+                LocateDeps $g  >> $MINDI_TMP/minimal2.lis
+            done
+        else 
+            if [ -r $f ]; then
+                echo $f >> $MINDI_TMP/minimal.lis
+                LocateDeps $f >> $MINDI_TMP/minimal2.lis
+            fi
         fi
     done
@@ -2607 +2624 @@
         LogIt "INFO: udev device manager found"
         tar cf - -C / /etc/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "ERROR: Problem in /etc/udev analysis" $MINDI_TMP/$$.log
-        # This avoids NIC remapping if on another machine at restore time on Debian at least
-        rm -f ./etc/udev/rules.d/z[0-9][0-9]_persistent-net.rules
-        # This avoids NIC remapping if on another machine at restore time on Ubuntu at least
-        rm -f ./etc/udev/rules.d/[0-9][0-9]-persistent-net.rules
+        # This avoids NIC remapping if on another machine at restore time on Debian/Ubuntu at least
+        rm -f ./etc/udev/rules.d/[z]*[0-9][0-9][-_]persistent-net.rules
         # Do not do it if it's a link (Ubuntu 64 bits #503)
-        if [ -e "/lib64/udev" ] && [ ! -h "/lib64" ] && [  ! -h "/lib64/udev" ]; then
+        if [ -e "/lib64/udev" ] && [ ! -h "/lib64" ] && [ ! -h "/lib64/udev" ]; then
             tar cf - -C / /lib64/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "ERROR: Problem in /lib64/udev analysis" $MINDI_TMP/$$.log
         fi
@@ -2620 +2635 @@
         if [ -e "/lib/udev" ] && [ ! -h "/lib" ] && [  ! -h "/lib/udev" ]; then
             tar cf - -C / /lib/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "ERROR: Problem in /lib/udev analysis" $MINDI_TMP/$$.log
+        fi
+        if [ -e "/usr/lib/udev" ] && [ ! -h "/usr/lib" ] && [  ! -h "/usr/lib/udev" ]; then
+            tar cf - -C / /usr/lib/udev 2>> $MINDI_TMP/$$.log | tar xf -  || LogIt "ERROR: Problem in /usr/lib/udev analysis" $MINDI_TMP/$$.log
         fi
         if [ -x /sbin/udevd ] || [ -x /usr/bin/udevd ] || [ -x /usr/lib/systemd/systemd-udevd ]; then
@@ -2631 +2649 @@
                     while [ -h $j ]; do
                         lis="$lis $j"
-                        j=`readlink $j`
+                        j=`readlink -f $j`
                     done
                     lis="$lis $j"
@@ -2645 +2663 @@
                     [ "$j" != "" ] && rm -f $j
                 fi
+                echo "$i" >> $MINDI_TMP/udev.lis
             done
             tar cf - -C / $lis `sort -u $MINDI_TMP/udev.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in udev.lis analysis" $MINDI_TMP/$$.log
@@ -2743 +2762 @@
     # Copy FW in case some drivers needs it
     for d in "/lib" "/usr/lib"; do
-        if [ -d "$d/firmware" ]; then
+        if [ -d "$d/firmware" -a ! -h $d ]; then
             cp -a "$d/firmware" "$mountpoint/$d"
         fi
@@ -2750 +2769 @@
     # Copy multipath dynamic libraries in case multipath is used (RHEL 6.4 and later)
     for d in "/lib" "/usr/lib" "/lib64" "/usr/lib64"; do
-        if [ -d "$d/multipath" ]; then
+        if [ -d "$d/multipath" -a ! -h $d ]; then
             cp -a "$d/multipath" "$mountpoint/$d"
         fi