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
1diff --git a/STRUCTURE b/STRUCTURE
2index eaae9ee..44c535f 100644
3--- a/STRUCTURE
4+++ b/STRUCTURE
5@@ -13,6 +13,7 @@ video: pre-seeds desktop
6 # Removed publishing from ISO 2021-10-30
7 # Removed fonts from ISO 2021-11-06
8 dvd-live: desktop audio-core audio audio-plugins graphics photography video live-common
9+live: desktop audio-core audio audio-plugins graphics photography video live-common
10 ship-live: desktop
11 dvd: boot dvd-live ship-live
12 # make sure supported remains the last entry
13diff --git a/live b/live
14new file mode 100644
15index 0000000..d1988d0
16--- /dev/null
17+++ b/live
18@@ -0,0 +1,50 @@
19+Task-Per-Derivative: 1
20+Task-Section: user
21+Task-Description: Ubuntu Studio live
22+Task-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.
23+Task-Relevance: 2
24+Task-Key: ubiquity-frontend-gtk
25+Task-Test-new-install: skip show
26+Task-Seeds: live-common
27+
28+ * Languages: en
29+ * language-pack-${Languages} [!powerpc]
30+
31+# subset of English language support which we want by default:
32+ # firefox-locale-en - Removed, Firefox is now a snap
33+ * hunspell-en-us [!powerpc]
34+ * wamerican
35+ * wbritish
36+
37+== Input methods ==
38+ * fcitx
39+ * fcitx-frontend-all
40+ * fcitx-frontend-fbterm
41+ * fcitx-frontend-gtk2
42+ * fcitx-frontend-gtk3
43+ * fcitx-frontend-qt5
44+ * fcitx-ui-classic
45+ * fcitx-table
46+ * fcitx-pinyin
47+ * fcitx-module-cloudpinyin
48+ * kde-config-fcitx
49+
50+ * cifs-utils # Needed by casper for CIFS root=
51+
52+ * zfsutils-linux # Experimental ZFS support, LP: #1843768, 1847739
53+ * zfs-initramfs # Experimental ZFS support, LP: #1847431, 1847739
54+
55+== Ubuntu Studio System Installer ==
56+
57+This is a system installer composed of a snap which uses components of
58+ubuntu-desktop-bootstrap and is a frontend to subiquity.
59+This replaces ubiquity in all Ubuntu flavors that had Ubiquity and did
60+not choose calamares
61+
62+ * snap:ubuntu-desktop-bootstrap/classic
63+ * ubuntustudio-live-settings
64+ * casper
65+
66+ * cryptsetup #for LUKS/encryption support
67+
68+

Subscribers

People subscribed via source and target branches