|
|
@ -525,7 +525,7 @@ if [ "$PREINSTALLED" = "true" ]; then
|
|
|
|
ubuntu-server)
|
|
|
|
ubuntu-server)
|
|
|
|
add_package live oem-config-debconf ubiquity-frontend-debconf
|
|
|
|
add_package live oem-config-debconf ubiquity-frontend-debconf
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
ubuntu-base|ubuntu-oci|base|ubuntu-cpc)
|
|
|
|
ubuntu-base|ubuntu-oci|ubuntu-cpc)
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
ubuntu)
|
|
|
|
ubuntu)
|
|
|
|
add_package live oem-config-gtk ubiquity-frontend-gtk
|
|
|
|
add_package live oem-config-gtk ubiquity-frontend-gtk
|
|
|
@ -732,10 +732,6 @@ case $PROJECT in
|
|
|
|
COMPONENTS='main restricted universe'
|
|
|
|
COMPONENTS='main restricted universe'
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
|
|
base)
|
|
|
|
|
|
|
|
add_task install minimal standard
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ubuntu-server)
|
|
|
|
ubuntu-server)
|
|
|
|
add_task install minimal
|
|
|
|
add_task install minimal
|
|
|
|
case ${SUBPROJECT:-} in
|
|
|
|
case ${SUBPROJECT:-} in
|
|
|
@ -1000,7 +996,7 @@ if [ "${IMAGE_HAS_HARDCODED_PASSWORD:-}" = "1" ]; then
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
case $PROJECT in
|
|
|
|
case $PROJECT in
|
|
|
|
ubuntu-cpc|ubuntu-core|ubuntu-base|ubuntu-oci|base)
|
|
|
|
ubuntu-cpc|ubuntu-core|ubuntu-base|ubuntu-oci)
|
|
|
|
# ubuntu-cpc gets this added in 025-create-groups.chroot, and we do
|
|
|
|
# ubuntu-cpc gets this added in 025-create-groups.chroot, and we do
|
|
|
|
# not want this group in projects that are effectively just chroots
|
|
|
|
# not want this group in projects that are effectively just chroots
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|