summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2009-02-13 17:00:36 +0100
committermaximilian attems <maks@debian.org>2009-02-13 17:02:47 +0100
commit6a8c246803f170948e8e7ebf17d5590838cb19db (patch)
tree3da6356c1ed2c24262ac6945e364d2dd3edb70e5
parentaf506d1ca8c8fac8fe9ca982dcdbddab8cc80f7c (diff)
downloadinitramfs-tools-6a8c246803f170948e8e7ebf17d5590838cb19db.tar.gz
initramfs-tools-6a8c246803f170948e8e7ebf17d5590838cb19db.zip
mkinitramfs: fix cp DESTDIR destination.
uncovered due to tests with harden cpio failures. bug got introduced postlenny in d2791a8fa458d473ff92d0710fe4d71487c76d6b.
-rwxr-xr-xmkinitramfs4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkinitramfs b/mkinitramfs
index 17c7925..70ff0fe 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -198,7 +198,7 @@ ln -s /usr/lib/klibc/bin/* ${DESTDIR}/bin
ln -s /lib/klibc-*.so ${DESTDIR}/lib
rm -f ${DESTDIR}/bin/kinit* ${DESTDIR}/bin/gzip
-cp -p /usr/share/initramfs-tools/init /init
+cp -p /usr/share/initramfs-tools/init ${DESTDIR}/init
# add existant boot scripts
for b in $(cd /usr/share/initramfs-tools/scripts/ && find . \
@@ -216,7 +216,7 @@ for b in $(cd "${CONFDIR}/scripts" && find . \
done
echo "DPKG_ARCH=${DPKG_ARCH}" > ${DESTDIR}/conf/arch.conf
-cp -p "${CONFDIR}/initramfs.conf" /conf
+cp -p "${CONFDIR}/initramfs.conf" ${DESTDIR}/conf
for i in ${EXTRA_CONF}; do
if [ -e "${CONFDIR}/conf.d/${i}" ]; then
copy_exec "${CONFDIR}/conf.d/${i}" /conf/conf.d