[Merge] ~edubuntu-dev/ubuntu-cdimage:main into ubuntu-cdimage:main

[Erich Eickmeyer]

Added more comment replies.

Diff comments:

> diff --git a/lib/cdimage/germinate.py b/lib/cdimage/germinate.py
> index af88a5f..eaa3498 100644
> --- a/lib/cdimage/germinate.py
> +++ b/lib/cdimage/germinate.py
> @@ -325,7 +325,11 @@ class GerminateOutput:
>                  if seed not in ship:
>                      yield seed
>          elif mode == "dvd":
> -            if project == "ubuntu":
> +            if project == "edubuntu":
> +                # no inheritance; most of this goes on the live filesystem
> +                yield "dvd"

I kept this there just in case we decide to bring it back at some point. There was mild interest/feedback, but most of the feedback was interest in putting Edubuntu on Raspberry PI systems.

> +                yield "ship-live"
> +            elif project == "ubuntu":
>                  # no inheritance; most of this goes on the live filesystem
>                  yield "usb-langsupport"
>                  yield "usb-ship-live"


-- 
https://code.launchpad.net/~edubuntu-dev/ubuntu-cdimage/+git/ubuntu-cdimage/+merge/437167
Your team Edubuntu Developers is subscribed to branch ~edubuntu-dev/ubuntu-cdimage:main.