Merge branch 'master' of git://git.wolf31o2.org/projs/genkernel

4 files changed, 5 insertions, 5 deletions

diff --git a/defaults/config.sh b/defaults/config.sh
index df72b1b5..7f339eac 100755
--- a/defaults/config.sh
+++ b/defaults/config.sh
@@ -1,5 +1,4 @@
-#!/bin/bash
-
+# $Id$
 #
 # Arch-specific options that normally shouldn't be changed.
 #
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 1ccab592..a3478aff 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -869,7 +869,7 @@ rundebugshell() {
 
 swsusp_resume() {
 	# determine swap resume partition
-	local device=$(ls -Ll "${REAL_RESUME}" | sed 's/\ */ /g' | cut -d \  -f 6-7 | sed 's/,\ */:/')
+	local device=$(ls -lL "${REAL_RESUME}" | sed 's/\  */ /g' | cut -d \  -f 5-6 | sed 's/,\ */:/')
 	[ -f /sys/power/resume ] && echo "${device}" > /sys/power/resume
 	return 0
 }
diff --git a/defaults/modprobe b/defaults/modprobe
index 1591c427..87901220 100755
--- a/defaults/modprobe
+++ b/defaults/modprobe
@@ -22,7 +22,7 @@ modules_dep_list() {
 		echo 'modules_dep_list(): Improper usage!'
 		exit 1
 	fi
-	cat /lib/modules/${KV}/modules.dep | grep ${1}${KSUFF}\: | cut -d\:  -f2
+	cat /lib/modules/${KV}/modules.dep | grep /"${1}${KSUFF}:" | cut -d':'  -f2
 }
 
 
@@ -84,6 +84,7 @@ modprobe2() {
 	real_path=`real_mod_path ${1}`
 	if [ "${real_path}" = '' -o "${real_path}" = ' ' ]
 	then
+		[ "${2}" = '-n' ] && echo -n " -> $1"
 		echo ' module not found.'
 		exit 2
 	fi
diff --git a/defaults/modules_load b/defaults/modules_load
index f54dd7b4..15ad3e5f 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -10,7 +10,7 @@ MODULES_MDADM="dm-mod dm-snapshot dm-mirror dm-bbr raid0 raid1 raid456 raid5 rai
 # Hardware (IDE/SCSI/SATA)
 MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535 pata_sl82c105 libata"
 MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc"
+MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor wd7000 NCR53c406a sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-xxxx 3w-9xxx cpqarray cciss DAC960 sx8 aacraid megaraid megaraid_mbox megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx aic94xx"
 MODULES_WAITSCAN="scsi_wait_scan"
 
 # Hardware (Network)