Merge ~mwhudson/ubuntu-seeds/+git/ubuntustudio:oracular into ~ubuntustudio-dev/ubuntu-seeds/+git/ubuntustudio:oracular

Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Erich Eickmeyer
Approved revision: b44a0aae7653800e59ca7061951c4b0f877c8697
Merged at revision: b44a0aae7653800e59ca7061951c4b0f877c8697
Proposed branch: ~mwhudson/ubuntu-seeds/+git/ubuntustudio:oracular
Merge into: ~ubuntustudio-dev/ubuntu-seeds/+git/ubuntustudio:oracular
Diff against target: 68 lines (+51/-0)
2 files modified
STRUCTURE (+1/-0)
live (+50/-0)
Reviewer Review Type Date Requested Status
Erich Eickmeyer Approve
Review via email: mp+465833@code.launchpad.net

Commit message

copy dvd-live seed to live

I want to remove the distinction that ubuntustudio is a "DVD". We can
remove dvd-live once the is all done in other places.

To post a comment you must log in.
Revision history for this message
Erich Eickmeyer (eeickmeyer) wrote :

Yes, let's go ahead with this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/STRUCTURE b/STRUCTURE
index eaae9ee..44c535f 100644
--- a/STRUCTURE
+++ b/STRUCTURE
@@ -13,6 +13,7 @@ video: pre-seeds desktop
13# Removed publishing from ISO 2021-10-3013# Removed publishing from ISO 2021-10-30
14# Removed fonts from ISO 2021-11-0614# Removed fonts from ISO 2021-11-06
15dvd-live: desktop audio-core audio audio-plugins graphics photography video live-common15dvd-live: desktop audio-core audio audio-plugins graphics photography video live-common
16live: desktop audio-core audio audio-plugins graphics photography video live-common
16ship-live: desktop17ship-live: desktop
17dvd: boot dvd-live ship-live18dvd: boot dvd-live ship-live
18# make sure supported remains the last entry19# make sure supported remains the last entry
diff --git a/live b/live
19new file mode 10064420new file mode 100644
index 0000000..d1988d0
--- /dev/null
+++ b/live
@@ -0,0 +1,50 @@
1Task-Per-Derivative: 1
2Task-Section: user
3Task-Description: Ubuntu Studio live
4Task-Extended-Description: This task provides the extra packages installed on the Ubuntu Studio live CD. It is neither useful nor recommended to install this task in other environments.
5Task-Relevance: 2
6Task-Key: ubiquity-frontend-gtk
7Task-Test-new-install: skip show
8Task-Seeds: live-common
9
10 * Languages: en
11 * language-pack-${Languages} [!powerpc]
12
13# subset of English language support which we want by default:
14 # firefox-locale-en - Removed, Firefox is now a snap
15 * hunspell-en-us [!powerpc]
16 * wamerican
17 * wbritish
18
19== Input methods ==
20 * fcitx
21 * fcitx-frontend-all
22 * fcitx-frontend-fbterm
23 * fcitx-frontend-gtk2
24 * fcitx-frontend-gtk3
25 * fcitx-frontend-qt5
26 * fcitx-ui-classic
27 * fcitx-table
28 * fcitx-pinyin
29 * fcitx-module-cloudpinyin
30 * kde-config-fcitx
31
32 * cifs-utils # Needed by casper for CIFS root=
33
34 * zfsutils-linux # Experimental ZFS support, LP: #1843768, 1847739
35 * zfs-initramfs # Experimental ZFS support, LP: #1847431, 1847739
36
37== Ubuntu Studio System Installer ==
38
39This is a system installer composed of a snap which uses components of
40ubuntu-desktop-bootstrap and is a frontend to subiquity.
41This replaces ubiquity in all Ubuntu flavors that had Ubiquity and did
42not choose calamares
43
44 * snap:ubuntu-desktop-bootstrap/classic
45 * ubuntustudio-live-settings
46 * casper
47
48 * cryptsetup #for LUKS/encryption support
49
50

Subscribers

People subscribed via source and target branches