Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-15 12:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge lp:~sil2100/livecd-rootfs/dangling-vmlinuz

Browse Source
This commit is contained in:
Steve Langasek 2018-11-01 15:12:34 -07:00
commit 7a993d10e4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,12 +1,17 @@
livecd-rootfs (2.543) UNRELEASED; urgency=medium livecd-rootfs (2.543) UNRELEASED; urgency=medium
[ Cody Shepherd ]
* Ensure pre-seeded snaps are now published in the image manifests. * Ensure pre-seeded snaps are now published in the image manifests.
* Include grub efi packages in manifests for uefi images. * Include grub efi packages in manifests for uefi images.
[ Aleksandr Bogdanov ] [ Aleksandr Bogdanov ]
* vagrant: disabling automatic console log file * vagrant: disabling automatic console log file
-- Cody Shepherd <cody.shepherd@canonical.com> Mon, 22 Oct 2018 10:16:19 -0700 [ Łukasz 'sil2100' Zemczak ]
* Avoid issues of hard-linking to a symbolic vmlinuz as this can lead to a
dangling symlink.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 18 Sep 2018 10:21:30 +0200
livecd-rootfs (2.542) cosmic; urgency=medium livecd-rootfs (2.542) cosmic; urgency=medium

4
live-build/auto/build
View File

@ -849,13 +849,13 @@ done
NUMFLAVOURS="$(set -- $LB_LINUX_FLAVOURS; echo $#)" NUMFLAVOURS="$(set -- $LB_LINUX_FLAVOURS; echo $#)"
if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
# only one kernel flavour # only one kernel flavour
if [ -e "binary/$INITFS/vmlinuz" ]; then if [ -f "binary/$INITFS/vmlinuz" ]; then
ln "binary/$INITFS/vmlinuz" "$PREFIX.kernel" ln "binary/$INITFS/vmlinuz" "$PREFIX.kernel"
chmod 644 "$PREFIX.kernel" chmod 644 "$PREFIX.kernel"
else else
ln -sf "$PREFIX.kernel-$LB_LINUX_FLAVOURS" "$PREFIX.kernel" ln -sf "$PREFIX.kernel-$LB_LINUX_FLAVOURS" "$PREFIX.kernel"
fi fi
if [ -e "binary/$INITFS/initrd.lz" ]; then if [ -f "binary/$INITFS/initrd.lz" ]; then
ln "binary/$INITFS/initrd.lz" "$PREFIX.initrd" ln "binary/$INITFS/initrd.lz" "$PREFIX.initrd"
chmod 644 "$PREFIX.initrd" chmod 644 "$PREFIX.initrd"
else else