- improve run_bootloader (elilo, zipl)

- fix preinst sed command
- bunch of minor fixes

9 files changed, 74 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 49d07a9..022e167 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+initramfs-tools (0.84) unstable; urgency=high
+
+  Release "A-t-on pris à Saint-Périne, Tous ces dictateurs impotents ?"
+
+  * hook-functions: Use modprobe --ignore-install arg to put all listed
+    modules on initramfs. Thanks Mario Izquierdo <mariodebian@gmail.com>
+    for report. (closes: 384043)
+
+  * update-initramfs: If elilo is around run it on initramfs update, add
+    zipl run.
+
+  * scripts/local: Use vol_id too if around to set FSTYPE. Thanks for the
+    patch to "Alex Owen" <r.alex.owen@gmail.com> (closes: 380004)
+
+  *  hooks/thermal: Add many of the windfarm modules for powerpc boxes.
+
+  * initramfs-tools.preinst: merge bits of 0.69ubuntu16. (closes: 393773)
+    urgency high as fixes upgrade from sarge - thanks Federico Grau
+    <donfede@casagrau.org>.
+
+  * scripts/init-top/framebuffer: Fix mknod call. (closes: 393543)
+    Thanks for the patch Kiro Zimmer <debian@kironet.de>.
+
+  * mkinitramfs: Create modulesdir even on monolithic linux. (closes: 393688)
+    Thanks for the patch Ian Campbell <ijc@hellion.org.uk>.
+
+ -- maximilian attems <maks@sternwelten.at>  Wed, 18 Oct 2006 11:04:50 +0200
+
 initramfs-tools (0.83) unstable; urgency=high
 
   Release "Ois was du verzapfst is a koida Kaffee"
@@ -438,6 +466,18 @@ initramfs-tools (0.69b) unstable; urgency=high
 
  -- maximilian attems <maks@sternwelten.at>  Fri, 14 Jul 2006 00:31:30 +0200
 
+initramfs-tools (0.69ubuntu16) edgy; urgency=low
+
+  * Bring in preinst fixes from Debian, including s/configure/install/ in
+    preinst, since preinst is never called with "configure", and checking
+    for /proc/swaps before we blindly try to read it to determine RESUME.
+  * Do away with the bogus '-n "$2"' test in preinst, since "install" can
+    be called without any arguments at all (and often is, on a clean setup)
+  * On upgrades, revert the RESUME mangling that dapper's d-i did to our
+    config file, avoiding spurious conffile prompts (launchpad.net/63693)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 16 Oct 2006 17:23:41 +1000
+
 initramfs-tools (0.69ubuntu15) edgy; urgency=low
 
   * Add jmicron module to ide list.
diff --git a/debian/initramfs-tools.preinst b/debian/initramfs-tools.preinst
index fc1fd06..aa8c8ca 100644
--- a/debian/initramfs-tools.preinst
+++ b/debian/initramfs-tools.preinst
@@ -4,7 +4,6 @@ set -e
 
 case "$1" in
 	install)
-	if [ -n "$2" ]; then
 		mkdir -p /etc/initramfs-tools/conf.d
 
 		# First time install.  Can we autodetect the RESUME partition?
@@ -29,7 +28,7 @@ case "$1" in
 			  -e '/# This file should/,/one per line\./d' \
 			  -e 's/Comments begin with.*/Syntax:  module_name [args ...]/' \
 			  -e 's/^#  ext2$/# raid1/' \
-			  -e 's/^#  wd io=0x300$/# sd_mod/'
+			  -e 's/^#  wd io=0x300$/# sd_mod/' \
 			  -e '/^ide-generic/d' \
 			  -e '/^ide-disk/d' \
 			  -e '/^ext2/d' \
@@ -40,7 +39,6 @@ case "$1" in
 		if [ -e /etc/mkinitrd/DSDT ]; then
 			cp /etc/mkinitrd/DSDT /etc/initramfs-tools/DSDT.aml
 		fi
-	fi
 	;;
 	upgrade)
 	if [ -n "$2" ] && dpkg --compare-versions "$2" lt "0.61"; then
diff --git a/hook-functions b/hook-functions
index 98c88a2..8df30f2 100644
--- a/hook-functions
+++ b/hook-functions
@@ -40,7 +40,8 @@ add_modules_from_file()
 
 manual_add_modules()
 {
-	for mam_x in $(modprobe --set-version="${version}" --show-depends "${1}" 2>/dev/null | awk '/^insmod/ { print $2 }'); do
+	for mam_x in $(modprobe --set-version="${version}" --ignore-install \
+	--show-depends "${1}" 2>/dev/null | awk '/^insmod/ { print $2 }'); do
 		# Prune duplicates
 		if [ -e "${DESTDIR}/${mam_x}" ]; then
 			continue
diff --git a/hooks/thermal b/hooks/thermal
index 9bfd323..ece7243 100755
--- a/hooks/thermal
+++ b/hooks/thermal
@@ -23,6 +23,17 @@ case "$DPKG_ARCH" in
 # copy the right modules
 powerpc|ppc64)
 	manual_add_modules therm_pm72
+	manual_add_modules windfarm_core
+	manual_add_modules windfarm_cpufreq_clamp
+	manual_add_modules windfarm_lm75_sensor
+	manual_add_modules windfarm_max6690_sensor
+	manual_add_modules windfarm_pid
+	manual_add_modules windfarm_pm112
+	manual_add_modules windfarm_pm81
+	manual_add_modules windfarm_pm91
+	manual_add_modules windfarm_smu_controls
+	manual_add_modules windfarm_smu_sat
+	manual_add_modules windfarm_smu_sensors
 	manual_add_modules i2c-powermac
 	;;
 i386|amd64|ia64)
diff --git a/initramfs-tools.8 b/initramfs-tools.8
index 4ce53d3..690505f 100644
--- a/initramfs-tools.8
+++ b/initramfs-tools.8
@@ -1,4 +1,4 @@
-.TH INITRAMFS-TOOLS 8  "Date: 2006/10/11" "" "mkinitramfs script overview"
+.TH INITRAMFS-TOOLS 8  "Date: 2006/10/14" "" "mkinitramfs script overview"
 
 .SH NAME
 initramfs-tools \- an introduction to writing scripts for mkinitramfs
@@ -438,7 +438,7 @@ to double-check if it contains the relevant binaries, libs or modules:
 .nf
 mkdir tmp/initramfs
 cd tmp/initramfs
-gunzip -c -9 /boot/initrd.img-2.6.17-2-686 | \\
+gunzip -c -9 /boot/initrd.img-2.6.18-1-686 | \\
 cpio -i -d -H newc --no-absolute-filenames
 .fi
 .RE
diff --git a/mkinitramfs b/mkinitramfs
index f667c53..2fd0cc8 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -166,7 +166,7 @@ export verbose
 # Private, used by 'catenate_cpiogz'.
 export __TMPCPIOGZ
 
-for d in bin conf/conf.d etc lib modules sbin scripts; do
+for d in bin conf/conf.d etc lib modules sbin scripts ${MODULESDIR}; do
 	mkdir -p "${DESTDIR}/${d}"
 done
 
diff --git a/scripts/init-top/framebuffer b/scripts/init-top/framebuffer
index bafbe19..8382b20 100755
--- a/scripts/init-top/framebuffer
+++ b/scripts/init-top/framebuffer
@@ -82,7 +82,7 @@ fi
 
 if [ -e /proc/fb ]; then
 	while read fbno desc; do
-		mknod /dev/fb$fbno 29 $fbno
+		mknod /dev/fb$fbno c 29 $fbno
 	done < /proc/fb
 
 	mknod /dev/fb0 c 29 0
diff --git a/scripts/local b/scripts/local
index 299fc65..f4079d5 100644
--- a/scripts/local
+++ b/scripts/local
@@ -51,6 +51,10 @@ mountroot ()
 	else
 		FSTYPE=${ROOTFSTYPE}
 	fi
+	if [ "$FSTYPE" = "unknown" ] && [ -x /lib/udev/vol_id ]; then
+		FSTYPE=$(/lib/udev/vol_id -t ${ROOT})
+		[ -z "$FSTYPE" ] && FSTYPE="unknown"
+	fi
 
 	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/local-premount"
 	run_scripts /scripts/local-premount
diff --git a/update-initramfs b/update-initramfs
index 151e47a..c112211 100755
--- a/update-initramfs
+++ b/update-initramfs
@@ -148,10 +148,11 @@ mbr_check()
 	echo
 }
 
-# only run lilo if no grub is around
-# or if "do_bootloader = yes" is set
+# Invoke bootloader
 run_bootloader()
 {
+	# only run lilo if no grub is around
+	# or if "do_bootloader = yes" is set
 	if [ -x /sbin/grub ] || [ -e /boot/grub/menu.lst ] \
 	|| [ -x /usr/sbin/grub ]; then
 		if [ -e /etc/lilo.conf ] && [ -x /sbin/lilo ]; then
@@ -168,8 +169,16 @@ run_bootloader()
 		fi
 		return 0
 	fi
-	if [ -e /etc/lilo.conf ] && [ -x /sbin/lilo ]; then
+	if [ -r /etc/lilo.conf ] && [ -x /sbin/lilo ]; then
 		run_lilo
+		return 0
+	fi
+	if [ -x /sbin/elilo ]; then
+		elilo
+		return 0
+	fi
+	if [ -r /etc/zipl.conf ]; then
+		zipl
 	fi
 }