mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-06-09 17:11:35 +00:00
a less hackish approach
This commit is contained in:
parent
e80459b967
commit
a261471969
@ -268,7 +268,7 @@ EOF
|
|||||||
rm -rf chroot/var/lib/apt/lists/*
|
rm -rf chroot/var/lib/apt/lists/*
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f config/oem-config-preinstalled ]; then
|
if [ -f config/universe-enabled ]; then
|
||||||
|
|
||||||
# This is cargo-culted almost verbatim (with some syntax changes for
|
# This is cargo-culted almost verbatim (with some syntax changes for
|
||||||
# preinstalled being slightly different in what it doesn't ask) from
|
# preinstalled being slightly different in what it doesn't ask) from
|
||||||
|
@ -151,7 +151,7 @@ case $IMAGEFORMAT in
|
|||||||
# by skipping lb_chroot_live-packages.
|
# by skipping lb_chroot_live-packages.
|
||||||
skip_lb_stage chroot_live-packages
|
skip_lb_stage chroot_live-packages
|
||||||
INITRAMFS_TYPE=auto
|
INITRAMFS_TYPE=auto
|
||||||
PREINSTALLED=true
|
touch config/universe-enabled
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
PREINSTALLED=true
|
PREINSTALLED=true
|
||||||
@ -214,9 +214,9 @@ case $IMAGEFORMAT in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
if [ "$PREINSTALLED" = "true" ]; then
|
if [ "$PREINSTALLED" = "true" ]; then
|
||||||
# This is an oem-config preinstalled image, touch a random file that
|
# Touch a random file that we can refer back to during build,
|
||||||
# we can refer back to during build, cause that's wildly hackish
|
# cause that's wildly hackish
|
||||||
touch config/oem-config-preinstalled
|
touch config/universe-enabled
|
||||||
case $PROJECT in
|
case $PROJECT in
|
||||||
kubuntu*)
|
kubuntu*)
|
||||||
add_package live oem-config-kde ubiquity-frontend-kde
|
add_package live oem-config-kde ubiquity-frontend-kde
|
||||||
@ -495,10 +495,8 @@ 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
|
||||||
|
PREINSTALL_POOL_SEEDS='server-ship'
|
||||||
COMPONENTS='main'
|
COMPONENTS='main'
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@ -697,10 +695,6 @@ 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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user