summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2006-01-24 13:10:56 +0100
committermaximilian attems <maks@debian.org>2006-01-24 13:10:56 +0100
commite31be60a62406ef81d949eb67ac2bc64e90bf4ad (patch)
treed33d4a09354a690aa0e01e2e2d73ccd03969206e
parent5ac8871bdc5093eb2b570937dcc37167b904cb8e (diff)
downloadinitramfs-tools-e31be60a62406ef81d949eb67ac2bc64e90bf4ad.tar.gz
initramfs-tools-e31be60a62406ef81d949eb67ac2bc64e90bf4ad.zip
take care of modular atkb and i8042.
seen on the Debian ppc .config!?
-rw-r--r--debian/changelog7
-rw-r--r--hook-functions2
-rw-r--r--scripts/functions2
3 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b82a343..9704e27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,13 @@ initramfs-tools (0.51) unstable; urgency=low
- skip 0.40ubuntu15 udev gets fixed to only call update-initramfs
when /etc/mkinitramfs/initramfs.conf is there.
- 0.40ubuntu13 don't take over all initramfs images in Debian.
+
+ * hook-functions: auto_add_modules atkb and i8042.
+
+ * scripts/functions: on panic modprobe atkb and i8042 - work around for
+ broken configs, where those are not build in. (Closes: #337497)
- -- maximilian attems <maks@sternwelten.at> Tue, 24 Jan 2006 11:12:18 +0100
+ -- maximilian attems <maks@sternwelten.at> Tue, 24 Jan 2006 13:04:40 +0100
initramfs-tools (0.50c) unstable; urgency=low
diff --git a/hook-functions b/hook-functions
index 000c701..bb44d9e 100644
--- a/hook-functions
+++ b/hook-functions
@@ -137,7 +137,7 @@ dep_add_modules()
auto_add_modules()
{
# base
- for x in ehci-hcd ohci-hcd uhci-hcd usbhid usb-storage ext2 ext3 isofs jfs nfs reiserfs xfs af_packet; do
+ for x in ehci-hcd ohci-hcd uhci-hcd usbhid usb-storage ext2 ext3 isofs jfs nfs reiserfs xfs af_packet atkbd i8042; do
manual_add_modules "${x}"
done
diff --git a/scripts/functions b/scripts/functions
index 7f8fa3c..2113745 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -57,6 +57,8 @@ panic()
if [ -x /sbin/usplash_write ]; then
/sbin/usplash_write "QUIT"
fi
+ modprobe -q i8042
+ modprobe -q atkbd
echo $@
FS1='(initramfs) ' /bin/sh </dev/console >/dev/console 2>&1
}