- News entry for the confdir mv

- check for doc befor copying modules
- add arcmsr to scsi module
- tighten udev dep

5 files changed, 35 insertions, 3 deletions

diff --git a/debian/NEWS b/debian/NEWS
index e755806..d4647d4 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,14 @@
+initramfs-tools (0.61) unstable; urgency=low
+
+  * This release moves the initramfs-tools confdir from /etc/mkinitramfs to
+    /etc/initramfs-tools. Packages are encouraged to ship files as scripts
+    under /usr/share/initramfs-tools.
+
+    Local tests behaved fine, but be warned that this could potentially
+    cause boot troubles on upgrade.
+
+ -- maximilian attems <maks@sternwelten.at>  Wed, 21 Jun 2006 09:16:01 +0200
+
 initramfs-tools (0.10) breezy; urgency=low
 
   * This release includes hardware auto detection in the initramfs.
diff --git a/debian/changelog b/debian/changelog
index 4a02bdc..ba0fe4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+initramfs-tools (0.62) unstable; urgency=low
+
+  * debian/control: Tighten dep on udev. udev 0.086-1 loads ide-disk.
+    Can't lower to sarge version anyway as no coldplugg support there.
+    (closes: #358360, #362816)
+
+  * debian/initramfs-tools.postinst: Check if modules example is available
+    under doc before copying if not touch $CONFDIR/modules.
+    (closes: #368043)
+
+  * hook-functions: Add arcmsr to the scsi modules list.
+
+  * debian/NEWS: Add Notice about confdir mv as version 0.61.
+
+ -- maximilian attems <maks@sternwelten.at>  Wed, 21 Jun 2006 09:22:23 +0200
+
 initramfs-tools (0.61) unstable; urgency=low
 
   Release "O partigiano portami via"
diff --git a/debian/control b/debian/control
index bf022d9..6c59d5e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2.0
 
 Package: initramfs-tools
 Architecture: all
-Depends: klibc-utils (>= 1.1.16-1), busybox (>= 1:1.01-3) | busybox-cvs-static (>= 20040623-1), cpio, module-init-tools, udev (>= 0.076-5)
+Depends: klibc-utils (>= 1.1.16-1), busybox (>= 1:1.01-3) | busybox-cvs-static (>= 20040623-1), cpio, module-init-tools, udev (>= 0.086-1)
 Provides: linux-initramfs-tool
 Description: tools for generating an initramfs
  This package contains tools to create and boot an initramfs for prepackaged
diff --git a/debian/initramfs-tools.postinst b/debian/initramfs-tools.postinst
index 94c5c1b..f1cfcfa 100644
--- a/debian/initramfs-tools.postinst
+++ b/debian/initramfs-tools.postinst
@@ -36,7 +36,12 @@ if [ "$1" = configure ]; then
 fi
 
 if [ ! -e /etc/initramfs-tools/modules ]; then
-	cp /usr/share/doc/initramfs-tools/examples/modules /etc/initramfs-tools/
+	if [ -e /usr/share/doc/initramfs-tools/examples/modules ]; then
+		cp /usr/share/doc/initramfs-tools/examples/modules \
+			/etc/initramfs-tools/
+	else
+		touch /etc/initramfs-tools/modules
+	fi
 fi
 
 # Regenerate initramfs on upgrade
diff --git a/hook-functions b/hook-functions
index 874d55f..6d41f2e 100644
--- a/hook-functions
+++ b/hook-functions
@@ -168,7 +168,7 @@ auto_add_modules()
 	;;
 	scsi)
 		for x in 3w-9xxx 3w-xxxx a100u2x aacraid advansys ahci \
-		aic79xx aic7xxx ata_piix atari_scsi atp870u BusLogic \
+		aic79xx aic7xxx arcmsr ata_piix atari_scsi atp870u BusLogic \
 		cciss ch cpqarray dac960 dc395x dmx3191d dpt_i2o eata fdomain \
 		gdth ibmvscsic initio ipr ips isp1020 lpfc max_scsi mac53c94 \
 		megaraid megaraid_mbox megaraid_mm mesh mptfc mptscsih \