mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-06-09 17:11:35 +00:00
Merge remote-tracking branch 'xubuntu-dev/xubuntu-core' into ubuntu/master
This commit is contained in:
commit
d7d2c1fbfd
3
debian/tests/default-bootstraps
vendored
3
debian/tests/default-bootstraps
vendored
@ -38,7 +38,8 @@ ALL_TRIPLETS="
|
|||||||
ubuntu-mate-live::
|
ubuntu-mate-live::
|
||||||
ubuntu-netbook::
|
ubuntu-netbook::
|
||||||
ubuntu-server:live:ubuntu-server
|
ubuntu-server:live:ubuntu-server
|
||||||
xubuntu::"
|
xubuntu::
|
||||||
|
xubuntu:minimal:"
|
||||||
|
|
||||||
if [ -z "$SELECTED_TRIPLETS" ]; then
|
if [ -z "$SELECTED_TRIPLETS" ]; then
|
||||||
SELECTED_TRIPLETS="
|
SELECTED_TRIPLETS="
|
||||||
|
@ -776,7 +776,14 @@ case $PROJECT in
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
xubuntu)
|
xubuntu)
|
||||||
|
case ${SUBPROJECT:-} in
|
||||||
|
minimal)
|
||||||
|
add_task install minimal standard xubuntu-desktop-minimal
|
||||||
|
;;
|
||||||
|
*)
|
||||||
add_task install minimal standard xubuntu-desktop
|
add_task install minimal standard xubuntu-desktop
|
||||||
|
;;
|
||||||
|
esac
|
||||||
add_package install xterm
|
add_package install xterm
|
||||||
LIVE_TASK='xubuntu-live'
|
LIVE_TASK='xubuntu-live'
|
||||||
case $ARCH in
|
case $ARCH in
|
||||||
|
Loading…
x
Reference in New Issue
Block a user