Instead of renaming kernel for syslinux, create hardlinks

This commit is contained in:
Raphaël Hertzog 2016-12-02 15:42:59 +01:00
parent b8f7f19015
commit 9c974b26bf
3 changed files with 6 additions and 5 deletions

1
debian/changelog vendored
View File

@ -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

View File

@ -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)

View File

@ -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