summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2006-12-14 23:16:15 +0100
committermaximilian attems <maks@debian.org>2006-12-14 23:16:15 +0100
commitc03e70312632212c516acac750cb5ec0ef4b33cb (patch)
tree3f4e21b8e4b200853c6b1a39dbf3e71c369189a2
parent78fe68bcad9d0850e6b9877903719cab7c73b475 (diff)
downloadinitramfs-tools-c03e70312632212c516acac750cb5ec0ef4b33cb.tar.gz
initramfs-tools-c03e70312632212c516acac750cb5ec0ef4b33cb.zip
- show lilo error on lilo failure
- add hppa zalon module - reduce size due to keeping only 1 busybox copy - warn on update mode when no initramfs exist and takeover not specified
-rw-r--r--debian/changelog22
-rw-r--r--hook-functions2
-rwxr-xr-xmkinitramfs7
-rwxr-xr-xupdate-initramfs24
4 files changed, 43 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog
index acfa6f0..394179a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+initramfs-tools (0.85d) unstable; urgency=high
+
+ Release "Le gros ventre qu'engraisse L'suffrage universel"
+
+ * update-initramfs: run_lilo() needs to show errors of lilo -t on failure
+ and exit with failure message. Thanks David Anselmi <anselmi@anselmi.us>
+ for report. (closes: 401331) Updated according to review by
+ Jurij Smakov <jurij@debian.org>.
+
+ * hook-functions: Add hppa zalon scsi module. (closes: 401229) urgency high
+
+ * update-initramfs: Add warning for missing initramfs on update mode without
+ takeover arg. Restructure altered_check, don't delete sha1sum on failure.
+ Thanks Jurij Smakov <jurij@debian.org> for noticing.
+
+ * mkinitramfs: Reduce size of initramfs by keeping 1 busybox copy.
+ Thanks for the patch input to Russell Coker <russell@coker.com.au>.
+ Thanks for the sed rework to Klaus Ita <deb.ian@worstofall.com>.
+ (closes: 338405)
+
+ -- maximilian attems <maks@sternwelten.at> Thu, 14 Dec 2006 16:10:06 +0100
+
initramfs-tools (0.85c) unstable; urgency=medium
Release "Pour ĂȘtre heureux vraiment Faut plus d'gouvernement"
diff --git a/hook-functions b/hook-functions
index b4cd58d..67f5931 100644
--- a/hook-functions
+++ b/hook-functions
@@ -194,7 +194,7 @@ auto_add_modules()
sata_promise sata_qstor sata_sil sata_sil24 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
+ sd_mod stex sym53c8xx tmscsim zalon zfcp; do
manual_add_modules "${x}"
done
;;
diff --git a/mkinitramfs b/mkinitramfs
index 694f423..d187de0 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -228,7 +228,12 @@ if [ "x${BUSYBOX}" = "xn" ]; then
else
rm -f ${DESTDIR}/bin/sh
copy_exec ${BUSYBOXDIR}/busybox /bin/busybox
- ln -s ${BUSYBOXDIR}/busybox ${DESTDIR}/bin/sh
+ rm -f ${DESTDIR}/bin/busybox
+ cp ${BUSYBOXDIR}/busybox ${DESTDIR}/bin/busybox
+ for cmd in `busybox | sed -n '/functions:$/,$p' \
+ | sed -e 's/[[:space:]]*//g; s/,$//; s/,/\n/g; /busybox/d'`; do
+ ln -f ${DESTDIR}/bin/busybox ${DESTDIR}/bin/${cmd}
+ done
fi
# Modutils
diff --git a/update-initramfs b/update-initramfs
index 4b230d0..52e603b 100755
--- a/update-initramfs
+++ b/update-initramfs
@@ -134,11 +134,13 @@ generate_initramfs()
# lilo call
run_lilo()
{
- # suppress errors on test run
- lilo -t > /dev/null 2>&1
- if [ $? -eq 0 ]; then
- lilo
+ # show lilo errors on failure
+ if ! lilo -t > /dev/null 2>&1 ; then
+ echo "update-initramfs: lilo run failed for ${initramfs}:"
+ echo
+ lilo -t
fi
+ lilo
}
# check if lilo is on mbr
@@ -387,14 +389,16 @@ delete()
rm -f "${initramfs}"
}
-
+# Check for update mode on existing and modified initramfs
altered_check()
{
- if [ "${takeover}" = 0 ]; then
- if ! compare_sha1; then
- delete_sha1
- mild_panic "${initramfs} has been altered. Cannot update."
- fi
+ # No check on takeover
+ [ "${takeover}" = 1 ] && return 0
+ if [ ! -e "${initramfs}" ]; then
+ mild_panic "${initramfs} does not exist. Cannot update."
+ fi
+ if ! compare_sha1; then
+ mild_panic "${initramfs} has been altered. Cannot update."
fi
}