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

Properly fix the hard-linking of vmlinuz, taken astray by my misguided

Browse Source 
merge review.
This commit is contained in:
Steve Langasek 2018-11-02 14:47:26 -07:00
parent af4858dcec
commit 1e1c6a8572
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.544) UNRELEASED; urgency=medium
* Properly fix the hard-linking of vmlinuz, taken astray by my misguided
merge review.
-- Steve Langasek <steve.langasek@ubuntu.com> Fri, 02 Nov 2018 14:46:30 -0700
livecd-rootfs (2.543) disco; urgency=medium
[ Cody Shepherd ]

4
live-build/auto/build
View File

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