summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2006-10-05 16:22:08 +0200
committermaximilian attems <maks@debian.org>2006-10-05 16:22:08 +0200
commitf49c698f4838b09794ebdd129e7eee14de2aad54 (patch)
tree4bfd6e7e388022a7eb57522525c813805044ec59
parentb8c8f676a5f0da208b27e4d9bac71ae3814a1b97 (diff)
downloadinitramfs-tools-f49c698f4838b09794ebdd129e7eee14de2aad54.tar.gz
initramfs-tools-f49c698f4838b09794ebdd129e7eee14de2aad54.zip
add ide jmicron module + ubuntu changelogs
add scsi qla4xxx module
-rw-r--r--debian/changelog30
-rw-r--r--hook-functions11
2 files changed, 36 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 6efe40c..2990625 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+initramfs-tools (0.82) unstable; urgency=high
+
+ * Merge 0.69ubuntu15, plus 0.69ubuntu14 and 0.69ubuntu11 changelog entries
+ as not affected or already fixed.
+
+ * hook-initramfs: Add qla4xxx support, thus urgency high.
+
+ -- maximilian attems <maks@sternwelten.at> Thu, 5 Oct 2006 16:12:06 +0200
+
initramfs-tools (0.81) unstable; urgency=low
Release quick and happy spin j = l + s
@@ -388,6 +397,27 @@ initramfs-tools (0.69b) unstable; urgency=high
-- maximilian attems <maks@sternwelten.at> Fri, 14 Jul 2006 00:31:30 +0200
+initramfs-tools (0.69ubuntu15) edgy; urgency=low
+
+ * Add jmicron module to ide list.
+ - Malone #63085
+
+ -- Ben Collins <bcollins@ubuntu.com> Wed, 4 Oct 2006 09:21:08 -0400
+
+initramfs-tools (0.69ubuntu14) edgy; urgency=low
+
+ * Remove stray "set -x" from scripts/local-premount/suspend.
+
+ -- Adam Conrad <adconrad@ubuntu.com> Wed, 20 Sep 2006 08:35:05 +1000
+
+initramfs-tools (0.69ubuntu11) edgy; urgency=low
+
+ * since we ship /usr/share/initramfs-tools/conf.d as well as
+ /etc/initramfs-tools/conf.d, make sure mkinitramfs also reads from both,
+ not only from the /etc location
+
+ -- Oliver Grawert <ogra@ubuntu.com> Sun, 10 Sep 2006 11:50:14 +0200
+
initramfs-tools (0.69ubuntu4) edgy; urgency=low
* scripts/local-premount/suspend: Check for UUID= or LABEL= on the
diff --git a/hook-functions b/hook-functions
index 9cb9712..98c88a2 100644
--- a/hook-functions
+++ b/hook-functions
@@ -161,9 +161,10 @@ auto_add_modules()
ide)
for x in ide-cd ide-disk ide-generic aec62xx alim15x3 \
amd74xx atiixp atuuxo cmd64x cs5520 cs5530 cy82c693 \
- generic hpt34x hpt366 it821x ns87415 opti621 pdc202xx_new \
- pdc202xx_old piix rz1000 sc1200 serverworks siimage \
- sis5513 slc82c105 slc90e66 triflex trm290 via82cxxx; do
+ generic hpt34x hpt366 it821x jmicron ns87415 opti621 \
+ pdc202xx_new pdc202xx_old piix rz1000 sc1200 serverworks \
+ siimage sis5513 slc82c105 slc90e66 triflex trm290 \
+ via82cxxx; do
manual_add_modules "${x}"
done
;;
@@ -176,8 +177,8 @@ auto_add_modules()
megaraid megaraid_mbox megaraid_mm megaraid_sas \
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 \
+ qla4xxx 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 \
sd_mod stex sym53c8xx tmscsim zfcp; do