summaryrefslogtreecommitdiff
path: root/src/scripts/21image.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:04:37 +0200
committerDaniel Baumann <daniel@debian.org>2007-09-23 10:04:37 +0200
commit782da921f85b6756f844bc64bcaa1804826ed23b (patch)
tree688b8562e94d06ae94822c084369790895bc731f /src/scripts/21image.sh
parentf5e26be70004a382b440519a9e3f73778bf12e8d (diff)
downloadlive-build-782da921f85b6756f844bc64bcaa1804826ed23b.zip
live-build-782da921f85b6756f844bc64bcaa1804826ed23b.tar.gz
Adding live-package 0.99.15-1.
Diffstat (limited to 'src/scripts/21image.sh')
-rw-r--r--src/scripts/21image.sh17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/scripts/21image.sh b/src/scripts/21image.sh
index 5261867..36ca014 100644
--- a/src/scripts/21image.sh
+++ b/src/scripts/21image.sh
@@ -215,20 +215,17 @@ Syslinux ()
Linuximage ()
{
- # Removing initrd backup files
- rm -f "${LIVE_CHROOT}"/boot/initrd*bak*
-
case "${1}" in
iso)
# Copy linux-image
if [ "${LIVE_FLAVOUR}" = "minimal" ]
then
- mv "${LIVE_CHROOT}"/boot/vmlinuz-* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
- mv "${LIVE_CHROOT}"/boot/initrd.img-* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
+ mv "${LIVE_CHROOT}"/boot/vmlinuz* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
+ mv "${LIVE_CHROOT}"/boot/initrd.img* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
rm -f "${LIVE_CHROOT}"/vmlinuz "${LIVE_CHROOT}"/initrd.img
else
- cp "${LIVE_CHROOT}"/boot/vmlinuz-* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
- cp "${LIVE_CHROOT}"/boot/initrd.img-* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
+ cp "${LIVE_CHROOT}"/boot/vmlinuz* "${LIVE_ROOT}"/binary/isolinux/vmlinuz
+ cp "${LIVE_CHROOT}"/boot/initrd.img* "${LIVE_ROOT}"/binary/isolinux/initrd.gz
fi
;;
@@ -236,10 +233,10 @@ Linuximage ()
# Copy linux-image
if [ "${LIVE_FLAVOUR}" = "minimal" ]
then
- mv "${LIVE_ROOT}"/chroot/boot/vmlinuz-* "${LIVE_ROOT}"/tftpboot/vmlinuz
- mv "${LIVE_ROOT}"/chroot/boot/initrd.img-* "${LIVE_ROOT}"/tftpboot/initrd.gz
+ mv "${LIVE_ROOT}"/chroot/boot/vmlinuz* "${LIVE_ROOT}"/tftpboot/vmlinuz
+ mv "${LIVE_ROOT}"/chroot/boot/initrd.img* "${LIVE_ROOT}"/tftpboot/initrd.gz
else
- cp "${LIVE_ROOT}"/chroot/boot/vmlinuz-* "${LIVE_ROOT}"/tftpboot/vmlinuz
+ cp "${LIVE_ROOT}"/chroot/boot/vmlinuz* "${LIVE_ROOT}"/tftpboot/vmlinuz
cp "${LIVE_ROOT}"/chroot/boot/initrd.img-* "${LIVE_ROOT}"/tftpboot/initrd.gz
fi
;;