summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2006-09-27 16:03:30 +0200
committermaximilian attems <maks@debian.org>2006-09-27 16:03:30 +0200
commitb8c8f676a5f0da208b27e4d9bac71ae3814a1b97 (patch)
treebba2efe7783427d1ea4c414497e47ff11dda191c /debian
parent681dc7a7566afa2de5fa7d1edf8aa1c25ec451a6 (diff)
downloadinitramfs-tools-b8c8f676a5f0da208b27e4d9bac71ae3814a1b97.tar.gz
initramfs-tools-b8c8f676a5f0da208b27e4d9bac71ae3814a1b97.zip
- mkinitramfs: allow umask setting paranoid
- revert an nfs changes small fixes over the place
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog27
-rw-r--r--debian/initramfs-tools.preinst6
2 files changed, 31 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index d4033ac..6efe40c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+initramfs-tools (0.81) unstable; urgency=low
+
+ Release quick and happy spin j = l + s
+
+ * update-initramfs: Really check for mounted /proc on use. (closes: 388241)
+ Thanks Alex Owen <r.alex.owen@gmail.com>. While beeing in this business,
+ check for mounted proc in initramfs-tools.preinst too.
+
+ * hook-functions: Add new scsi drivers aic94xx and stex. Add new net drivers
+ ehea, ep93xx_eth and qla3xxx. Thus urgency high.
+
+ * update-initramfs: Use set ``--'' to change positional paramaters. Thanks
+ Jörg Sommer <joerg@alea.gnuu.de>. (closes: 389726)
+
+ * scripts/nfs: Revert to previous handling of dhcp server passing server-ip.
+ (closes: 387808)
+
+ * debian/initramfs-tools.preinst: Fix comment typo, thanks
+ shaulka@012.net.il for the patch. (closes: 389486)
+
+ * mkinitramfs: Allow an hook script to set an paranoid umask, considered
+ useful for shipping gpg keys inside of initramfs. Thanks Max Vozeler
+ <max@nusquama.org> and Lionel Elie Mamane <lionel@mamane.lu> for the
+ patch. (closes: 381677)
+
+ -- maximilian attems <maks@sternwelten.at> Wed, 27 Sep 2006 15:56:46 +0200
+
initramfs-tools (0.80) unstable; urgency=high
Release "O partigiano, portami via, che mi sento di morir."
diff --git a/debian/initramfs-tools.preinst b/debian/initramfs-tools.preinst
index b92d393..7b02612 100644
--- a/debian/initramfs-tools.preinst
+++ b/debian/initramfs-tools.preinst
@@ -8,9 +8,11 @@ case "$1" in
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 } ')
+ if [ -r /proc/swaps ]; then
+ RESUME=$(tail -n $(($(wc -l /proc/swaps | awk ' { print $1 } ') - 1)) /proc/swaps | sort -rk3 | head -n 1 | awk ' { print $1 } ')
+ fi
- # Inhertic initrd-tools settings if possible.
+ # Inherit initrd-tools settings if possible.
if [ -e /etc/mkinitrd/mkinitrd.conf ]; then
. /etc/mkinitrd/mkinitrd.conf
fi