diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2010-09-09 14:10:39 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2010-09-09 14:10:39 -0700 |
| commit | d000689490bbc3508f18b878757b3d2bb04d8a69 (patch) | |
| tree | 40388b9f23e75fc4c0884f7fb076f2d6382e1136 /scripts/init-top | |
| parent | b9c92a3bb82e860c8368eb7933f5ec4ddcd74bcb (diff) | |
| parent | 3963c563cf1ea4b1126a4c1949181029a0ff2305 (diff) | |
| download | initramfs-tools-d000689490bbc3508f18b878757b3d2bb04d8a69.tar.gz initramfs-tools-d000689490bbc3508f18b878757b3d2bb04d8a69.zip | |
Merge remote branch 'debian/master' into upstream
Diffstat (limited to 'scripts/init-top')
| -rwxr-xr-x | scripts/init-top/all_generic_ide | 4 | ||||
| -rwxr-xr-x | scripts/init-top/blacklist | 25 |
2 files changed, 27 insertions, 2 deletions
diff --git a/scripts/init-top/all_generic_ide b/scripts/init-top/all_generic_ide index 3274ee8..e9539d8 100755 --- a/scripts/init-top/all_generic_ide +++ b/scripts/init-top/all_generic_ide @@ -16,11 +16,11 @@ esac for x in $(cat /proc/cmdline); do case ${x} in all_generic_ide) - modprobe ide-generic + modprobe ata_generic all_generic_ide=1 ;; all_generic_ide=*) if [ ${x#all_generic_ide=} ]; then - modprobe ide-generic + modprobe ata_generic all_generic_ide=1 fi ;; esac diff --git a/scripts/init-top/blacklist b/scripts/init-top/blacklist new file mode 100755 index 0000000..2164906 --- /dev/null +++ b/scripts/init-top/blacklist @@ -0,0 +1,25 @@ +#!/bin/sh + +PREREQ="" + +prereqs() +{ + echo "$PREREQ" +} + +case $1 in +# get pre-requisites +prereqs) + prereqs + exit 0 + ;; +esac + +# sanity check +[ -z "${blacklist}" ] && exit 0 + +# write blacklist to modprobe.d +IFS=',' +for b in ${blacklist}; do + echo "blacklist $b" >> /etc/modprobe.d/initramfs.conf +done |