- fix noresume exporting

- readd plain upgly kernel-package interface to mkinitramfs
  with depreciation warning
- nice fixes in preinst by Kamion

4 files changed, 42 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 9623ae4..056ccb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+initramfs-tools (0.69b) unstable; urgency=high
+
+  * debian/initramfs-tools.preinst: Don't depend upon shipped directories
+    to be existing. Thanks Colin Watson <cjwatson@debian.org> for patch.
+    Add trailing slash to copy command. (closes: 378089)
+
+  * mkinitramfs: Revert the removal of kernel-package supported lonng param
+    of 0.65. Readd that plain ugly interface. Warn users they should use
+    ramdisk=mkinitramfs-kpkg. As kernel-package doesn't yet support
+    update-initramfs. Thanks Frans Pop <fjp@debian.org> for report.
+
+  * Thus high urgency upload.
+
+ -- maximilian attems <maks@sternwelten.at>  Thu, 13 Jul 2006 23:20:49 +0200
+
 initramfs-tools (0.69) unstable; urgency=low
 
   * scripts/local-premount/suspend, scripts/local-premount/resume: Rename
diff --git a/debian/initramfs-tools.preinst b/debian/initramfs-tools.preinst
index dca832f..b92d393 100644
--- a/debian/initramfs-tools.preinst
+++ b/debian/initramfs-tools.preinst
@@ -5,6 +5,8 @@ set -e
 case "$1" in
 	configure)
 	if [ -n "$2" ]; then
+		mkdir -p /etc/initramfs-tools/conf.d
+
 		# First time install.  Can we autodetect the RESUME partition?
 		RESUME=$(tail -n $(($(wc -l /proc/swaps | awk ' { print $1 } ') - 1)) /proc/swaps | sort -rk3 | head -n 1 | awk ' { print $1 } ')
 
@@ -18,7 +20,7 @@ case "$1" in
 
 		# Add initrd-tools modules, while trying to minimize prompting
 		if [ -e /etc/mkinitrd/modules ]; then
-			cp /etc/mkinitrd/modules /etc/initramfs-tools
+			cp /etc/mkinitrd/modules /etc/initramfs-tools/
 			sed -i \
 			  -e 's/\/etc\/mkinitrd\/modules: Kernel modules to load for initrd./List of modules that you want to include in your initramfs./g' \
 			  -e 's/mkinitrd/update-initramfs/g' \
diff --git a/init b/init
index 427b964..2beb597 100755
--- a/init
+++ b/init
@@ -104,7 +104,7 @@ for x in $(cat /proc/cmdline); do
 	esac
 done
 
-if [ -n ${NORESUME} ]; then
+if [ -z ${NORESUME} ]; then
         export resume=${RESUME}
 fi
 
diff --git a/mkinitramfs b/mkinitramfs
index f532228..a0bec9e 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -10,7 +10,7 @@ errors_to="2>/dev/null"
 # BUSYBOXDIR="/usr/lib/initramfs-tools/bin/"
 BUSYBOXDIR="/bin" 
 
-OPTIONS=`getopt -o d:ko:r:v -n "$0" -- "$@"`
+OPTIONS=`getopt -o d:ko:r:v --long supported-host-version:,supported-target-version: -n "$0" -- "$@"`
 
 # Check for non-GNU getopt
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
@@ -44,6 +44,14 @@ while true; do
 		verbose="y"
 		shift
 		;;
+	--supported-host-version)
+		supported_host_version="$2"
+		shift 2
+		;;
+	--supported-target-version)
+		supported_target_version="$2"
+		shift 2
+		;;
 	--)
 		shift
 		break
@@ -55,6 +63,20 @@ while true; do
 	esac
 done
 
+if [ -n "$supported_host_version" ] || [ -n "$supported_target_version" ]; then
+	if [ -n "$supported_host_version" ]; then
+		host_upstream_version="${supported_host_version%%-*}"
+	fi
+	if [ -n "$supported_target_version" ]; then
+		target_upstream_version="${supported_target_version%%-*}"
+		if dpkg --compare-versions "$target_upstream_version" lt "2.6.12"; then
+			exit 2
+		fi
+	fi
+	echo "Depreciation warning: use ramdisk=mkinitramfs-kpkg."
+	exit 0
+fi
+
 # For dependency ordered mkinitramfs hook scripts.
 . /usr/share/initramfs-tools/scripts/functions
 . /usr/share/initramfs-tools/hook-functions