diff options
| author | maximilian attems <maks@debian.org> | 2006-07-24 09:13:28 +0200 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2006-07-24 09:13:28 +0200 |
| commit | 8761821795732a9755d673e92fb45ac9202270df (patch) | |
| tree | 2f6f5d1fc992df86554fa484e477a040ddf03d4c /hook-functions | |
| parent | 475bcbc9d6eefe90de6efe424bfb5bcca999fbc7 (diff) | |
| download | initramfs-tools-8761821795732a9755d673e92fb45ac9202270df.tar.gz initramfs-tools-8761821795732a9755d673e92fb45ac9202270df.zip | |
- add BUSYBOX section to conf
- add myri10ge, smc911x and hptiop modules
- fix check_minkver() logic
- escape resume variables
- fix SEE ALSO section in all manpages
- source /usr/share/initramfs-tools/conf.d/*
- check against modules.dep before running depmod
- more verbose output
- open console with -i for dash interactive
- fix resume param by LABEL or UUID
- lvm has new prereq mdadm
- update-initramfs fix -v calling
- functions/scripts replace basename usage with shell expansion
Diffstat (limited to 'hook-functions')
| -rw-r--r-- | hook-functions | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/hook-functions b/hook-functions index 9b1bd24..3175cba 100644 --- a/hook-functions +++ b/hook-functions @@ -149,8 +149,8 @@ auto_add_modules() net) for x in 3c59x 8139cp 8139too 8390 b44 bmac bnx2 defxx \ dl2k e1000 e100 epic100 eql fealnx famachi forcedeth \ - hp100 mace mv643xx_eth natsemi ne2k-pci netconsole \ - ns83820 pcnet32 r8169 s2io sis900 skge slhc starfire \ + hp100 mace mv643xx_eth myri10ge natsemi ne2k-pci netconsole \ + ns83820 pcnet32 r8169 s2io sis900 skge slhc smc911x starfire \ sundance sungem sungem_phy sunhme tg3 tlan de2104x \ de4x5 dmfe tulip winbond-840 xircom_cb xircom_tulip_cb \ typhon via-rhine via-velocity yellowfin; do @@ -170,10 +170,10 @@ auto_add_modules() for x in 3w-9xxx 3w-xxxx a100u2x aacraid advansys ahci \ aic79xx aic7xxx arcmsr ata_piix atari_scsi atp870u BusLogic \ cciss ch cpqarray dac960 dc395x dmx3191d dpt_i2o eata fdomain \ - gdth ibmvscsic initio ipr ips isp1020 lpfc max_scsi mac53c94 \ - megaraid megaraid_mbox megaraid_mm mesh mptfc mptscsih \ - mptsas mptspi nsp32 osst qla1280 qla2100 qla2200 qla2300 \ - qla2322 qla2xxx qla6312 qlogicfas408 qlogicfc sata_mv \ + gdth hptiop ibmvscsic initio ipr ips isp1020 lpfc max_scsi \ + mac53c94 megaraid megaraid_mbox megaraid_mm mesh mptfc \ + mptscsih mptsas mptspi nsp32 osst qla1280 qla2100 qla2200 \ + qla2300 qla2322 qla2xxx qla6312 qlogicfas408 qlogicfc sata_mv \ sata_nv sata_promise sata_qstor sata_sil sata_sis sata_svw \ sata_sx4 sata_uli sata_via sata_vsc scsi_mod \ scsi_transport_fc scsi_transport_iscsi scsi_transport_spi \ @@ -231,7 +231,6 @@ check_minkver() { curversion=${1} initdir=${2} - set_initlist if [ -z ${initdir} ]; then DPKG_ARCH=`dpkg --print-installation-architecture` case ${DPKG_ARCH} in @@ -247,8 +246,10 @@ check_minkver() echo "W: not generating requested initramfs for kernel ${curversion}" >&2 exit 2 fi + return 0 fi - [ -z ${initdir} ] || for cm_x in ${initlist}; do + set_initlist + for cm_x in ${initlist}; do tmp=$(eval echo $(grep ^MINKVER ${initdir}/${cm_x} | cut -d'=' -f2)) if dpkg --compare-versions "${curversion}" lt "${tmp}"; then echo "W: ${cm_x} hook script requires at least kernel version ${tmp}" >&2 |