diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | scripts/build/binary_iso | 2 | ||||
| -rwxr-xr-x | scripts/build/binary_syslinux | 8 |
3 files changed, 6 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 0e18b1e62..2c080783b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,7 @@ live-build (1:20161128) UNRELEASED; urgency=medium * Default for LB_UNION_FILESYSTEM is now "overlay" just like in live-boot. * Update the way we generate the version of live-build that is displayed by lb --version. + * Instead of renaming kernel for syslinux, create hardlinks. [ Kristian Klausen ] * Include ext{3,4} journal size when calculating image size. Closes: #801712 diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index 2b381622a..99cae59a8 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -151,7 +151,7 @@ do ;; esac - XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table" + XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table --hardlinks" ;; grub-efi) diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 80ee6d874..1347aa20b 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -186,8 +186,8 @@ then 1) # If multiple initrd images are being generated (by DKMS packages, etc), # we likely only want the latest version. - mv $(ls -r1 --sort=version binary/${_INITRAMFS}/vmlinuz-* | head -n 1) binary/${_INITRAMFS}/vmlinuz - mv $(ls -r1 --sort=version binary/${_INITRAMFS}/initrd.img-* | head -n 1) binary/${_INITRAMFS}/initrd.img + ln $(ls -r1 --sort=version binary/${_INITRAMFS}/vmlinuz-* | head -n 1) binary/${_INITRAMFS}/vmlinuz + ln $(ls -r1 --sort=version binary/${_INITRAMFS}/initrd.img-* | head -n 1) binary/${_INITRAMFS}/initrd.img sed -e "s|@FLAVOUR@|${LB_LINUX_FLAVOURS}|g" \ -e "s|@LINUX@|/${_INITRAMFS}/vmlinuz|g" \ @@ -204,8 +204,8 @@ then do _NUMBER="$((${_NUMBER} + 1))" - mv binary/${_INITRAMFS}/vmlinuz-*-${_FLAVOUR} binary/${_INITRAMFS}/vmlinuz${_NUMBER} - mv binary/${_INITRAMFS}/initrd.img-*-${_FLAVOUR} binary/${_INITRAMFS}/initrd${_NUMBER}.img + ln binary/${_INITRAMFS}/vmlinuz-*-${_FLAVOUR} binary/${_INITRAMFS}/vmlinuz${_NUMBER} + ln binary/${_INITRAMFS}/initrd.img-*-${_FLAVOUR} binary/${_INITRAMFS}/initrd${_NUMBER}.img if [ "${_NUMBER}" -gt 1 ] then |