diff options
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/initramfs-tools.install | 1 | ||||
| -rw-r--r-- | debian/initramfs-tools.manpages | 1 | ||||
| -rw-r--r-- | mkinitramfs-kpkg | 94 | ||||
| -rw-r--r-- | mkinitramfs-kpkg.8 | 49 | ||||
| -rw-r--r-- | update-initramfs | 4 |
6 files changed, 11 insertions, 153 deletions
diff --git a/debian/changelog b/debian/changelog index 720c344..033943e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +initramfs-tools (0.52b) unstable; urgency=high + + * update-initramfs: Set takeover=1. This allows hooks to regenerate the + latest initramfs per default. No need for an kpkg wrapper, as + kernel-package doesn't call update-initramfs, but mkinitramfs. + + -- maximilian attems <maks@sternwelten.at> Mon, 20 Feb 2006 13:30:54 +0100 + initramfs-tools (0.52) unstable; urgency=low * hooks/lvm: manual_add_modules dm_snapshot, will allow boot from lvm @@ -8,17 +16,12 @@ initramfs-tools (0.52) unstable; urgency=low * scripts/init-premount/udev-helper: Renamed from scripts/init-premount/ide. * update-initramfs: s/was/has/ been altered. - (closes: #351939, #352633, #353087) + (closes: #351939, #352633, #353087, #353668) * update-initramfs(8), mkinitramfs(8): The point of the first is to be used on your local box. Highlight its mode of operations. The second cmd is only needed for advanced usage. - * mkinitramfs-kpkg: Add an compat call for kernel-package. Has the same - broken syntax than mkinitrd and adds an sha1sum for update-initramfs. - - * mkinitramfs-kpkg.8: Add warnings to use update-initramfs instead. - -- maximilian attems <maks@sternwelten.at> Fri, 17 Feb 2006 21:41:11 +0100 initramfs-tools (0.51) unstable; urgency=low diff --git a/debian/initramfs-tools.install b/debian/initramfs-tools.install index b722d90..3a7a503 100644 --- a/debian/initramfs-tools.install +++ b/debian/initramfs-tools.install @@ -1,5 +1,4 @@ mkinitramfs usr/sbin -mkinitramfs-kpkg usr/sbin init usr/share/initramfs-tools scripts usr/share/initramfs-tools conf/initramfs.conf etc/mkinitramfs diff --git a/debian/initramfs-tools.manpages b/debian/initramfs-tools.manpages index f127e99..8a27566 100644 --- a/debian/initramfs-tools.manpages +++ b/debian/initramfs-tools.manpages @@ -1,5 +1,4 @@ mkinitramfs.8 -mkinitramfs-kpkg.8 initramfs.conf.5 initramfs-tools.8 update-initramfs.8 diff --git a/mkinitramfs-kpkg b/mkinitramfs-kpkg deleted file mode 100644 index d36710a..0000000 --- a/mkinitramfs-kpkg +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh - -STATEDIR=/var/lib/initramfs-tools - -usage() -{ - cat >&2 << EOF - -Usage: ${0} <-o outfile> [version] - -Please use update-initramfs(8): -${0} exists for compatibility by kernel-package(5) calls. -See ${0}(8) for further details. -EOF - exit 1 -} - -OPTIONS=`getopt -o m:o: --long supported-host-version:,supported-target-version: -n "$0" -- "$@"` -# Check for non-GNU getopt -if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi - -eval set -- "$OPTIONS" - -while true; do - case "$1" in - -m) - # ignore - shift 2 - ;; - -o) - touch $2 - outfile="$(readlink -f "$2")" - shift 2 - ;; - --supported-host-version) - supported_host_version="$2" - shift 2 - ;; - --supported-target-version) - supported_target_version="$2" - shift 2 - ;; - --) - shift - break - ;; - *) - echo "Internal error!" >&2 - exit 1 - ;; - esac -done - -if [ -n "$supported_host_version" ] || [ -n "$supported_target_version" ]; then - if [ -n "$supported_host_version" ]; then - host_upstream_version="${supported_host_version%%-*}" - fi - if [ -n "$supported_target_version" ]; then - target_upstream_version="${supported_target_version%%-*}" - if dpkg --compare-versions "$target_upstream_version" lt "2.6.12"; then - exit 2 - fi - fi - exit 0 -fi - - -if [ -z "${outfile}" ]; then - usage -fi - -# And by "version" we really mean path to kernel modules -# This is braindead, and exists to preserve the interface with mkinitrd -version="${1}" - -case "${version}" in -/lib/modules/*/[!/]*) - ;; -/lib/modules/[!/]*) - version="${version#/lib/modules/}" - version="${version%%/*}" - ;; -esac - -case "${version}" in -*/*) - echo "$PROG: ${version} is not a valid kernel version" >&2 - exit 1 - ;; -esac - -# linux-image installs latest version -mkinitramfs -o ${outfile} ${version} -sha1sum "${outfile}" | sed -e 's/\.new//' > "${STATEDIR}/${version}" diff --git a/mkinitramfs-kpkg.8 b/mkinitramfs-kpkg.8 deleted file mode 100644 index 34f76db..0000000 --- a/mkinitramfs-kpkg.8 +++ /dev/null @@ -1,49 +0,0 @@ -.TH MKINITRAMFS-KPKG 8 "$Date: 2006/02/17 $" "" "mkinitramfs-kpkg manual" - -.SH NAME -mkinitramfs-kpkg \- generates an initramfs image for kernel-package - -.SH SYNOPSIS -.B mkinitramfs -.RB [ \-o -.IR outfile ] -.RI [ version ] -.B mkinitramfs -.RB [ \-\-supported-host-version= -.IR hversion ] -.RB [ \-\-supported-target-version= -.IR tversion ] - -.SH DESCRIPTION -The -.B mkinitramfs-kpkg -script calls -.B mkinitramfs -for kernel-package. It's usage is not recommended. -See -.B update-initramfs -for an better alternative. - -.SH OPTIONS - -.TP -\fB \-o \fI outfile -Write the image to -.IR outfile . - -.TP -\fB\-\-supported-host-version=\fIhversion -This option queries if mkinitramfs can create ramdisks on a running kernel of version -.IR hversion . - -.TP -\fB\-\-supported-target-version=\fItversion -This option queries if mkinitramfs can create ramdisks for kernel version -.IR tversion . - -.SH AUTHOR -mkinitramfs-kpkg is maintained by Maximilian Attems <maks@sternwelten.at>. - -.SH SEE ALSO - -.BR initramfs.conf (5), initramfs-tools (8), update-initramfs (8) diff --git a/update-initramfs b/update-initramfs index ddb6877..9ab4607 100644 --- a/update-initramfs +++ b/update-initramfs @@ -238,8 +238,8 @@ altered_check() # Defaults verbose=0 yes=0 -# We default to takeover=1 in Ubuntu, but not Debian -takeover=0 +# We default to takeover=1 to allow hooks to update latest initramfs +takeover=1 ## |