Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-28 03:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not include kernel in base install for ubuntu-server:live

Browse Source 
this actually makes things closer to the non-live server build and so
makes things a bit simpler
This commit is contained in:
Michael Hudson-Doyle 2018-12-13 10:47:54 +13:00
parent 25b16f97a6
commit c4e5659217
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
live-build/auto/config
View File

@ -145,20 +145,15 @@ case $IMAGEFORMAT in
;; ;;
plain) plain)
INITRAMFS_TYPE=none
case $PROJECT:${SUBPROJECT:-} in case $PROJECT:${SUBPROJECT:-} in
ubuntu-server:live) ubuntu-server:live)
# Stop lb installing casper into filesystem.squashfs
# by skipping lb_chroot_live-packages.
skip_lb_stage chroot_live-packages
INITRAMFS_TYPE=auto
touch config/universe-enabled touch config/universe-enabled
;; ;;
*) *)
PREINSTALLED=true PREINSTALLED=true
;; ;;
esac esac
OPTS="${OPTS:+$OPTS }--initramfs $INITRAMFS_TYPE --chroot-filesystem $IMAGEFORMAT" OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
;; ;;
ubuntu-image) ubuntu-image)
@ -519,9 +514,6 @@ case $PROJECT in
add_task install standard add_task install standard
add_task install server add_task install server
LIVE_TASK='cloud-image' LIVE_TASK='cloud-image'
case $ARCH in
amd64) add_package live linux-signed-generic ;;
esac
;; ;;
esac esac
COMPONENTS='main' COMPONENTS='main'
@ -837,8 +829,6 @@ case $ARCH in
esac esac
case $PROJECT:${SUBPROJECT:-} in case $PROJECT:${SUBPROJECT:-} in
ubuntu-server:live)
;;
ubuntu-server:*|ubuntu-base:*|ubuntu-touch:*|ubuntu-touch-custom:*) ubuntu-server:*|ubuntu-base:*|ubuntu-touch:*|ubuntu-touch-custom:*)
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
KERNEL_FLAVOURS=none KERNEL_FLAVOURS=none