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

[Erich Eickmeyer]

Review: Needs Resubmitting

Ok, after reviewing the comments, I'll close this MP and open a new one with the fixes. Thanks for the help!

Diff comments:

> diff --git a/bin/cron.dvd b/bin/cron.dvd
> index 3732b09..7391e54 100755
> --- a/bin/cron.dvd
> +++ b/bin/cron.dvd
> @@ -35,7 +35,7 @@ def main():
>      options, _ = parser.parse_args()
>      config = Config(IMAGE_TYPE="dvd")
>      project = config.project
> -    if project not in ("ubuntu", "ubuntustudio"):
> +    if project not in ("edubuntu", "ubuntu", "ubuntustudio"):

The history of Ubuntu Studio being DVD is that it only ever fit on a DVD. Same was true of Edubuntu, afaict.

>          config["CDIMAGE_INSTALL"] = "1"
>      config["CDIMAGE_LIVE"] = "1"
>      config["CDIMAGE_DVD"] = "1"


-- 
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.