diff options
Diffstat (limited to 'hook-functions')
| -rw-r--r-- | hook-functions | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/hook-functions b/hook-functions index e9f2368..6a68910 100644 --- a/hook-functions +++ b/hook-functions @@ -246,7 +246,8 @@ dep_add_modules() manual_add_modules "${FSTYPE}" # lvm or luks root - if [ "${root#/dev/mapper/}" != "${root}" ]; then + if [ "${root#/dev/mapper/}" != "${root}" ] \ + || [ "${root#/dev/dm-}" != "${root}" ]; then minor=$((0x$(stat --format "%T" ${root}) % 256)) block=$(ls -1 /sys/block/dm-${minor}/slaves | head -n 1) # lvm on luks or luks on lvm @@ -269,6 +270,19 @@ dep_add_modules() root=${root#/dev/} block=$(awk "/^${root}/{print substr(\$5, 1, 3); exit}" \ /proc/mdstat) + # cciss device + elif [ "${root#/dev/cciss/}" != "${root}" ]; then + block=${root#/dev/cciss/*} + block="cciss!${block%p*}" + # ida device + elif [ "${root#/dev/ida/}" != "${root}" ]; then + block=${root#/dev/ida/*} + block="ida!${block%p*}" + # loop root /dev/loopX + elif [ "${root#/dev/loop}" != "${root}" ]; then + root=${root#/dev/} + block=$(losetup -a \ + | awk "/${root}/{print substr(\$3, 7, 3); exit}") # classical root device else block=${root#/dev/} @@ -329,15 +343,17 @@ auto_add_modules() done ;; net) - for x in 3c59x 8139cp 8139too 8390 atl1 b44 bmac \ - bnx2 cxgb3 defxx dl2k e100 e1000 e1000e ehea epic100 \ + for x in 3c59x 8139cp 8139too 8390 atl1 atl1e b44 bmac \ + bnx2 cxgb cxgb3 de2104x de4x5 defxx dl2k dmfe \ + e100 e1000 e1000e ehea epic100 \ ep93xx_eth eql fealnx famachi forcedeth gelic_net \ - hp100 igb ipg mace mv643xx_eth myri10ge \ - natsemi ne2k-pci netconsole niu ns83820 pcnet32 qla3xxx \ - r8169 s2io sis900 skge sky2 slhc smc911x starfire \ - sundance sungem sungem_phy sunhme sunvnet tg3 tlan de2104x \ - de4x5 dmfe tulip winbond-840 xircom_cb xircom_tulip_cb \ - typhon via-rhine via-velocity yellowfin; do + hp100 igb ipg ixgb ixgbe mace mlx4_core mv643xx_eth myri10ge \ + natsemi ne2k-pci netconsole netxen_nic niu ns83820 \ + pcnet32 qla3xxx \ + r8169 s2io sfc sis900 skge sky2 slhc smc911x starfire \ + sundance sungem sungem_phy sunhme sunvnet tehuti tg3 tlan \ + tulip typhoon via-rhine via-velocity winbond-840 \ + xircom_cb xircom_tulip_cb yellowfin; do manual_add_modules "${x}" done ;; @@ -358,9 +374,6 @@ auto_add_modules() ;; block) copy_modules_dir kernel/drivers/block - for x in dasd_diag_mod; do - manual_add_modules "${x}" - done ;; # FIXME: can be removed after Lenny release ieee1394) @@ -379,7 +392,7 @@ auto_add_modules() done ;; dasd) - for x in dasd_eckd_mod dasd_fba_mod; do + for x in dasd_diag_mod dasd_eckd_mod dasd_fba_mod; do manual_add_modules "${x}" done ;; |