diff options
| author | David Härdeman <david@hardeman.nu> | 2007-04-14 10:57:12 +0200 |
|---|---|---|
| committer | David Härdeman <david@hardeman.nu> | 2007-04-14 10:57:12 +0200 |
| commit | 24973b26ba0b43594d6c2bdbc2680f51998b8294 (patch) | |
| tree | e2040ddf00649d8845ab2356d14661b042fbd15d | |
| parent | 8640586a5c7467a54ef1cc9cad77e5296aff26ae (diff) | |
| download | initramfs-tools-24973b26ba0b43594d6c2bdbc2680f51998b8294.tar.gz initramfs-tools-24973b26ba0b43594d6c2bdbc2680f51998b8294.zip | |
Revert NACK'ed change
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | scripts/init-premount/thermal | 4 | ||||
| -rw-r--r-- | scripts/local | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index a20ad86..838da0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,10 +11,9 @@ initramfs-tools (0.87) UNRELEASED; urgency=low * Add support for loading keymaps. (closes: 337663) * Move legacy code from mkinitramfs to separate hooks. * Ubuntu merge - - Use -Qb for for module loading to honor blacklists. - Add PS3 module loading functionality. - -- David Härdeman <david@hardeman.nu> Fri, 13 Apr 2007 21:01:11 +0200 + -- David Härdeman <david@hardeman.nu> Sat, 14 Apr 2007 10:53:56 +0200 initramfs-tools (0.86) unstable; urgency=low diff --git a/scripts/init-premount/thermal b/scripts/init-premount/thermal index e8a6ae4..aa146ec 100755 --- a/scripts/init-premount/thermal +++ b/scripts/init-premount/thermal @@ -31,7 +31,7 @@ powerpc|ppc64) modprobe windfarm_smu_sensors ;; i386|amd64|ia64) - modprobe -Qb fan - modprobe -Qb thermal + modprobe fan + modprobe thermal ;; esac diff --git a/scripts/local b/scripts/local index 47ef7fa..4e01472 100644 --- a/scripts/local +++ b/scripts/local @@ -67,7 +67,7 @@ mountroot () fi # FIXME This has no error checking - modprobe -Qb ${FSTYPE} + modprobe ${FSTYPE} # FIXME This has no error checking # Mount root |