Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-07 17:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

ffs

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2018-08-17 10:09:57 +12:00
parent 00151c5e0b
commit 1aa8b9d882
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -1,7 +1,7 @@
livecd-rootfs (2.535~ppa1) cosmic; urgency=medium livecd-rootfs (2.535~ppa2) cosmic; urgency=medium
* Set PREINSTALLED=true for live-server so that universe ends up being * Set PREINSTALLED=true for live-server so that universe ends up being
enabled in the image. enabled in the image. But make sure PREINSTALLED_POOL_SEEDS is not set.
-- Michael Hudson-Doyle <mwhudson@debian.org> Thu, 16 Aug 2018 21:28:00 +1200 -- Michael Hudson-Doyle <mwhudson@debian.org> Thu, 16 Aug 2018 21:28:00 +1200

8
live-build/auto/config
View File

@ -495,9 +495,11 @@ case $PROJECT in
amd64) add_package live linux-signed-generic ;; amd64) add_package live linux-signed-generic ;;
esac esac
;; ;;
*)
PREINSTALL_POOL_SEEDS='server-ship'
;;
esac esac
COMPONENTS='main' COMPONENTS='main'
PREINSTALL_POOL_SEEDS='server-ship'
;; ;;
ubuntu-core) ubuntu-core)
@ -695,6 +697,10 @@ export APT_OPTIONS
if [ "$PREINSTALLED" != "true" ] && [ "$LIVE_TASK" ]; then if [ "$PREINSTALLED" != "true" ] && [ "$LIVE_TASK" ]; then
add_task live "$LIVE_TASK" add_task live "$LIVE_TASK"
fi fi
if [ -n "$LIVE_TASK" ] && [ "$PROJECT:${SUBPROJECT:-}" = "ubuntu-server:live" ]; then
add_task live "$LIVE_TASK"
fi
case $PROJECT in case $PROJECT in
ubuntu-dvd) ubuntu-dvd)