summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2006-07-13 23:33:32 +0200
committermaximilian attems <maks@debian.org>2006-07-13 23:33:32 +0200
commit62bb60b509b62e6ce68d067b7f293019ed102b9a (patch)
treedaedd6fc3687a97a72685bae68ca5a7b182bfe68 /debian
parent50586c0818aa8de3ba3aa1c105acbe31537a9be1 (diff)
downloadinitramfs-tools-62bb60b509b62e6ce68d067b7f293019ed102b9a.tar.gz
initramfs-tools-62bb60b509b62e6ce68d067b7f293019ed102b9a.zip
- fix noresume exporting
- readd plain upgly kernel-package interface to mkinitramfs with depreciation warning - nice fixes in preinst by Kamion
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog15
-rw-r--r--debian/initramfs-tools.preinst4
2 files changed, 18 insertions, 1 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' \