summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-03-22 01:25:37 +0000
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:20 +0100
commit02a9e29e0923050f6f5386885946a80093930cd2 (patch)
treef6355cfc555704a3a0c92ee8b75f5ee6ce77e42c
parent25ac96ed146c4b7ea0bbe03e8f9996942b447210 (diff)
downloadlive-build-02a9e29e0923050f6f5386885946a80093930cd2.zip
live-build-02a9e29e0923050f6f5386885946a80093930cd2.tar.gz
lh_binary_debian-installer: Don't use --no-clobber for downloading files
Using --no-clobber at the same time as -O<file> results in <file> being created with no contents, which was resulting in (broken) zero-byte d-i kernels and initrds. The patch is simple -- simply remove --no-clobber: wget -O<file> <url> will always download <url> to <file>, regardless of how many times it is run.
-rwxr-xr-xhelpers/lh_binary_debian-installer8
1 files changed, 4 insertions, 4 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 52f8226..5d26fe9 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -218,15 +218,15 @@ fi
# Downloading debian-installer
mkdir -p "${DESTDIR_DI}"
-wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI_REMOTE_BASE}/${DI_REMOTE_KERNEL}
-wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz
+wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI_REMOTE_BASE}/${DI_REMOTE_KERNEL}
+wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz
# Downloading graphical-installer
if [ "${LH_ARCHITECTURE}" = "amd64" ] || [ "${LH_ARCHITECTURE}" = "i386" ] || [ "${LH_ARCHITECTURE}" = "powerpc" ]
then
mkdir -p "${DESTDIR_GI}"
- wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL}
- wget ${WGET_OPTIONS} --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz
+ wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL}
+ wget ${WGET_OPTIONS} -O "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz
fi
# Only download additional packages if appropriate