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

Merge remote-tracking branch 'jibel/germinate_with_updates' into ubuntu/master

Browse Source
This commit is contained in:
Steve Langasek 2023-12-03 19:59:07 -08:00
commit 5728443d00
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -1,7 +1,11 @@
livecd-rootfs (24.04.7) UNRELEASED; urgency=medium livecd-rootfs (24.04.7) UNRELEASED; urgency=medium
[ Dave Jones ]
* Remove more bits related to pre-installed desktop images (LP: #2038098) * Remove more bits related to pre-installed desktop images (LP: #2038098)
[ Jean-Baptiste Lallement ]
* Include -updates when calling germinate. LP: #1921862.
-- Dave Jones <dave.jones@canonical.com> Mon, 02 Oct 2023 15:46:06 +0100 -- Dave Jones <dave.jones@canonical.com> Mon, 02 Oct 2023 15:46:06 +0100
livecd-rootfs (24.04.6) noble; urgency=medium livecd-rootfs (24.04.6) noble; urgency=medium

4
live-build/auto/config
View File

@ -626,8 +626,8 @@ if ! [ -e config/germinate-output/structure ]; then
GERMINATE_ARG="-c $(echo $COMPONENTS | sed -e's/ \+/,/g')" GERMINATE_ARG="-c $(echo $COMPONENTS | sed -e's/ \+/,/g')"
fi fi
(cd config/germinate-output && germinate --no-rdepends --no-installer \ (cd config/germinate-output && germinate --no-rdepends --no-installer \
-S $SEEDMIRROR -m $MIRROR -d $SUITE -s $FLAVOUR.$SUITE \ -S $SEEDMIRROR -m $MIRROR -d $SUITE,$SUITE-updates \
$GERMINATE_ARG -a $ARCH) -s $FLAVOUR.$SUITE $GERMINATE_ARG -a $ARCH)
fi fi
case $PROJECT in case $PROJECT in