- allow to disable backup

- new bzr location
- functional copy_dir_modules()
- modprobe a bunch of ppc windfarm modules in thermal
- provide output on error

8 files changed, 91 insertions, 16 deletions

diff --git a/conf/update-initramfs.conf b/conf/update-initramfs.conf
index 36c3dde..278c51c 100644
--- a/conf/update-initramfs.conf
+++ b/conf/update-initramfs.conf
@@ -9,3 +9,11 @@
 # If set to no disables any update to initramfs beside kernel upgrade
 
 update_initramfs=yes
+
+#
+# backup_initramfs [ yes | no ]
+#
+# Default is yes
+# If set to no leaves no .bak backup files.
+
+backup_initramfs=yes
diff --git a/debian/changelog b/debian/changelog
index f6ef12c..acfa6f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,38 @@
+initramfs-tools (0.85c) unstable; urgency=medium
+
+  Release "Pour être heureux vraiment Faut plus d'gouvernement"
+
+  * hook-funcions: Show on verbose mode the added binaries and libraries.
+
+  * update-initramfs: Don't silently fail, user won't be able to reboot.
+    Thanks Mario Aeby for his blog entry.
+
+  * debian/copyright: Moved to bzr.d.o repo location.
+
+  * hook-functions: Merge 0.69ubuntu22 copy_module_dir fixes, we'll use it
+    too postetch. Fix the bashism. Thanks to Jurij Smakov <jurij@debian.org>
+
+  * scripts/init-premount/thermal: Load blindly a bunch of thermal modules
+    on powerpc as they are not hotpluggable. Might be ugly, but is a safe bet.
+    Kernel plattform fix is scheduled for 2.6.20. Push with medium urgency.
+    (closes: 401269)
+
+ -- maximilian attems <maks@sternwelten.at>  Sat,  2 Dec 2006 18:06:34 +0100
+
+initramfs-tools (0.85b) unstable; urgency=medium
+
+  * mkinitramfs: Test for ${outfile} before touching anything. (closes: 381677)
+
+  * update-initramfs.conf, update-initramfs: Allow to disable backup strategy.
+    While we are it fix logic of backup_booted_initramfs(). (closes: 397787)
+    urgency medium.
+
+  * scripts/init-top/framebuffer: Fix regression of /dev/fb0 creation,
+    modprobe fb before creating device. Thanks to Otavio Salvador 
+    <otavio@debian.org> for patch.
+
+ -- maximilian attems <maks@sternwelten.at>  Tue, 14 Nov 2006 08:06:40 +0100
+
 initramfs-tools (0.85a) unstable; urgency=high
 
   * On first time run backup_booted_initramfs() has nothing to back up.
@@ -498,6 +533,13 @@ initramfs-tools (0.69b) unstable; urgency=high
 
  -- maximilian attems <maks@sternwelten.at>  Fri, 14 Jul 2006 00:31:30 +0200
 
+initramfs-tools (0.69ubuntu22) feisty; urgency=low
+
+  * For copy_module_dir, actually call manual_module for each one, so deps are
+    taken care of.
+
+ -- Ben Collins <bcollins@ubuntu.com>  Thu, 23 Nov 2006 02:10:29 -0500
+
 initramfs-tools (0.69ubuntu16) edgy; urgency=low
 
   * Bring in preinst fixes from Debian, including s/configure/install/ in
diff --git a/debian/copyright b/debian/copyright
index 2c681c2..396499f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,7 @@ The current ubuntu release can be found at:
 http://archive.ubuntu.com/ubuntu/pool/main/i/initramfs-tools/
 
 The Debian tree is maintained with "bzr" at:
-http://debian.stro.at/bzr-test/initramfs-tools/
+http://bzr.debian.org/kernel/initramfs-tools/
 
 Authors: Jeff Bailey <jbailey@ubuntu.com>, Adam Conrad <adconrad@ubuntu.com>,
 	 Scott James Remnant <scott@ubuntu.com>,
diff --git a/hook-functions b/hook-functions
index c6a42a6..b4cd58d 100644
--- a/hook-functions
+++ b/hook-functions
@@ -66,6 +66,9 @@ copy_exec() {
 		fi
 	else
 		ln -s ${1} ${DESTDIR}/${2}
+		if [ -n "${verbose}" ] && [ "${verbose}" = "y" ]; then
+			echo "Adding binary ${1}"
+		fi
 	fi
 
 	# Copy the dependant libraries
@@ -89,6 +92,9 @@ copy_exec() {
 		mkdir -p ${DESTDIR}/${dirname}
 		if [ ! -e ${DESTDIR}/${dirname}/${libname} ]; then
 			ln -s ${x} ${DESTDIR}/${dirname}
+			if [ -n "${verbose}" ] && [ "${verbose}" = "y" ]; then
+				echo "Adding library ${x}"
+			fi
 		fi
 	done
 }
@@ -96,9 +102,15 @@ copy_exec() {
 # Copy entire subtrees to the initramfs
 copy_modules_dir()
 {
-	tmpdir_modbase="${DESTDIR}/lib/modules/${version}"
-	mkdir -p "$(dirname "${tmpdir_modbase}/${1}")"
-	cp -a "${MODULESDIR}/${1}" "${tmpdir_modbase}/${1}"
+	if ! [ -d "${MODULESDIR}/${1}" ]; then
+		return;
+	fi
+	if [ -n "${verbose}" ] && [ "${verbose}" = "y" ]; then
+		echo "Copying module directory ${1}"
+	fi
+	for x_mod in $(find "${MODULESDIR}/${1}" -name '*.ko' -print); do
+		manual_add_modules `basename ${x_mod} .ko`
+	done
 }
 
 dep_add_modules()
diff --git a/mkinitramfs b/mkinitramfs
index 2fd0cc8..694f423 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -97,13 +97,13 @@ if [ -n "${UMASK}" ]; then
 	umask "${UMASK}"
 fi
 
-touch $outfile
-outfile="$(readlink -f "$outfile")"
-
 if [ -z "${outfile}" ]; then
 	usage
 fi
 
+touch "$outfile"
+outfile="$(readlink -f "$outfile")"
+
 # And by "version" we really mean path to kernel modules
 # This is braindead, and exists to preserve the interface with mkinitrd
 if [ ${#} -ne 1 ]; then
diff --git a/scripts/init-premount/thermal b/scripts/init-premount/thermal
index 3518e7c..bfea1fc 100755
--- a/scripts/init-premount/thermal
+++ b/scripts/init-premount/thermal
@@ -20,6 +20,15 @@ case "$DPKG_ARCH" in
 powerpc|ppc64)
 	modprobe -q i2c-powermac
 	modprobe -q therm_pm72
+	modprobe -q windfarm_cpufreq_clamp
+	modprobe -q windfarm_lm75_sensor
+	modprobe -q windfarm_max6690_sensor
+	modprobe -q windfarm_pm112
+	modprobe -q windfarm_pm81
+	modprobe -q windfarm_pm91
+	modprobe -q windfarm_smu_controls
+	modprobe -q windfarm_smu_sat
+	modprobe -q windfarm_smu_sensors
 	;;
 i386|amd64|ia64)
 	modprobe -q fan
diff --git a/scripts/init-top/framebuffer b/scripts/init-top/framebuffer
index 1d5e375..044b247 100755
--- a/scripts/init-top/framebuffer
+++ b/scripts/init-top/framebuffer
@@ -76,6 +76,11 @@ for x in $(cat /proc/cmdline); do
 	esac
 done
 
+if [ -n "$FB" ]; then
+	modprobe -q fbcon
+	modprobe -q $FB $OPTS
+fi
+
 if [ -e /proc/fb ]; then
 	while read fbno desc; do
 		mknod /dev/fb$fbno c 29 $fbno
@@ -86,8 +91,3 @@ fi
 for i in 0 1 2 3 4 5 6 7 8; do
 	mknod /dev/tty$i c 4 $i
 done
-
-if [ -n "$FB" ]; then
-	modprobe -q fbcon
-	modprobe -q $FB $OPTS
-fi
diff --git a/update-initramfs b/update-initramfs
index e694093..4b230d0 100755
--- a/update-initramfs
+++ b/update-initramfs
@@ -79,12 +79,16 @@ backup_initramfs()
 # keep booted initramfs
 backup_booted_initramfs()
 {
+	initramfs_bak="${initramfs}.dpkg-bak"
+
+	# first time run thus no backup
+	[ ! -r "${initramfs_bak}" ] && return 0
+
 	# chroot
 	[ ! -r /proc/uptime ] && rm -f "${initramfs_bak}" && return 0
 
-	# first time run
-	initramfs_bak="${initramfs}.dpkg-bak"
-	[ ! -r "${initramfs_bak}" ] && return 0
+	# no kept backup wanted
+	[ "${backup_initramfs}" = "no" ] && rm -f "${initramfs_bak}" && return 0
 
 	# no backup yet
 	if [ ! -r "${initramfs}.bak" ]; then
@@ -122,7 +126,7 @@ generate_initramfs()
 			# minversion wasn't met, exit 0
 			exit 0
 		fi
-		verbose "mkinitramfs failed for ${initramfs}"
+		echo "update-initramfs: failed for ${initramfs}"
 		exit $mkinitramfs_return
 	fi
 }