diff options
| author | maximilian attems <maks@debian.org> | 2009-05-18 14:00:01 +0200 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2009-05-18 14:02:56 +0200 |
| commit | 5fb8d7c356206b72c99c967ab7dde56c69393678 (patch) | |
| tree | cd87cec56d9eeccb4b3610481bce63f6c6a0ab58 | |
| parent | 2fd44e5b137544829e6d1f7586519e8a92459ba7 (diff) | |
| download | initramfs-tools-5fb8d7c356206b72c99c967ab7dde56c69393678.tar.gz initramfs-tools-5fb8d7c356206b72c99c967ab7dde56c69393678.zip | |
mkinitramfs: Invoke dpkg --print-architecture
Fixes:
> Running update-initramfs.
> update-initramfs: Generating /boot/initrd.img-2.6.29-2-amd64
> dpkg : avertissement : obsolete option
> '--print-installation-architecture', please use '--print-architecture'
> instead.
> dpkg : avertissement : obsolete option
> '--print-installation-architecture', please use '--print-architecture'
> instead.
While we are it nuke duplicate invocation,
since DPKG_ARCH is an exported variable anyway.
(closes: #529222)
Reported-by: Raphaël Hertzog <hertzog@debian.org>
Signed-off-by: maximilian attems <maks@debian.org>
| -rw-r--r-- | hook-functions | 1 | ||||
| -rwxr-xr-x | mkinitramfs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/hook-functions b/hook-functions index 38b24e9..6b2e3e4 100644 --- a/hook-functions +++ b/hook-functions @@ -483,7 +483,6 @@ check_minkver() curversion="${1}" initdir="${2}" if [ -z "${initdir}" ]; then - DPKG_ARCH=$(dpkg --print-installation-architecture) case ${DPKG_ARCH} in ia64|hppa) minversion="2.6.15" diff --git a/mkinitramfs b/mkinitramfs index 8f8e428..19972fb 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -141,7 +141,7 @@ fi DESTDIR="$(mktemp -t -d mkinitramfs_XXXXXX)" || exit 1 __TMPCPIOGZ="$(mktemp -t mkinitramfs-OL_XXXXXX)" || exit 1 -DPKG_ARCH=`dpkg --print-installation-architecture` +DPKG_ARCH=`dpkg --print-architecture` # Export environment for hook scripts. # |