ubiquity

Merge ~vorlon/ubiquity:lp.1959343 into ubiquity:master

  1. Git
  2. lp:~vorlon/ubiquity
  3. lp.1959343
  4. Merge into master
Proposed by Steve Langasek
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 7c1210c2913b871a837716943666b645098ccfd5
Merged at revision: 189a7576960ad27387e006d84dc16eda24a5c320
Proposed branch: ~vorlon/ubiquity:lp.1959343
Merge into: ubiquity:master
Diff against target: 168 lines (+11/-66)
7 files modified
d-i/source/apt-setup/debian/apt-mirror-setup.install (+0/-1)
d-i/source/apt-setup/debian/apt-mirror-setup.templates-ubuntu (+0/-12)
d-i/source/apt-setup/debian/apt-setup-udeb.templates (+4/-11)
d-i/source/apt-setup/generators/50mirror.ubuntu (+0/-33)
d-i/source/apt-setup/generators/90services-select (+0/-8)
debian/changelog (+7/-0)
debian/ubiquity.install-any (+0/-1)
Reviewer Review Type Date Requested Status
Łukasz Zemczak Needs Fixing
Review via email: mp+414702@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

NB I'm not sure how preseeds of undefined debconf keys is handled and if this would cause incompatibility with existing preseed files that set apt-setup/partner. If so we could provide this as a stub for compatibiilty.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Unknown keys are silently ignored.

On Fri, 28 Jan 2022, 00:18 Steve Langasek, <email address hidden>
wrote:

> NB I'm not sure how preseeds of undefined debconf keys is handled and if
> this would cause incompatibility with existing preseed files that set
> apt-setup/partner. If so we could provide this as a stub for compatibiilty.
> --
> https://code.launchpad.net/~vorlon/ubiquity/+git/ubiquity/+merge/414702
> Your team Ubuntu Installer Team is requested to review the proposed merge
> of ~vorlon/ubiquity:lp.1959343 into ubiquity:master.
>
>

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Ok, browsed through the source and didn't see any other leftovers. This seems to work so let's just proceed.

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Actually! I only now noticed that this is the wrong way to go, eh. So I completely forgot that d-i/source/* files are all managed in their own lp:debian-installer/* repositories. So uh, let me revert this and do it properly...

review: Needs Fixing
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

...okay, pushed this change to the apt-setup repo and pulled the changes properly. Should be good now.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/d-i/source/apt-setup/debian/apt-mirror-setup.install b/d-i/source/apt-setup/debian/apt-mirror-setup.install
2index 6bcf364..2378df0 100644
3--- a/d-i/source/apt-setup/debian/apt-mirror-setup.install
4+++ b/d-i/source/apt-setup/debian/apt-mirror-setup.install
5@@ -1,5 +1,4 @@
6 generators/50mirror.ubuntu usr/lib/apt-setup/generators
7 release-files/archive.ubuntu.com usr/share/apt-setup/release-files
8 release-files/security.ubuntu.com usr/share/apt-setup/release-files
9-release-files/archive.canonical.com usr/share/apt-setup/release-files
10 release-files/ports.ubuntu.com usr/share/apt-setup/release-files
11diff --git a/d-i/source/apt-setup/debian/apt-mirror-setup.templates-ubuntu b/d-i/source/apt-setup/debian/apt-mirror-setup.templates-ubuntu
12index b61325d..9646672 100644
13--- a/d-i/source/apt-setup/debian/apt-mirror-setup.templates-ubuntu
14+++ b/d-i/source/apt-setup/debian/apt-mirror-setup.templates-ubuntu
15@@ -37,18 +37,6 @@ _Description: Use software from the "multiverse" component?
16 .
17 Please choose whether you want this software to be made available to you.
18
19-Template: apt-setup/partner
20-Type: boolean
21-Default: false
22-# This template is used by the Ubuntu version of d-i.
23-# :sl2:
24-_Description: Use software from the "partner" repository?
25- Some additional software is available from Canonical's "partner"
26- repository. This software is not part of Ubuntu, but is offered by
27- Canonical and the respective vendors as a service to Ubuntu users.
28- .
29- Please choose whether you want this software to be made available to you.
30-
31 Template: apt-setup/backports
32 Type: boolean
33 Default: true
34diff --git a/d-i/source/apt-setup/debian/apt-setup-udeb.templates b/d-i/source/apt-setup/debian/apt-setup-udeb.templates
35index f790143..61ef1db 100644
36--- a/d-i/source/apt-setup/debian/apt-setup-udeb.templates
37+++ b/d-i/source/apt-setup/debian/apt-setup-udeb.templates
38@@ -122,19 +122,15 @@ _Description: Enable source repositories in APT?
39 you don't need this feature, you can disable those entries and save some
40 bandwidth during "apt-get update" operations.
41
42-# All services except partner are enabled by default to allow
43-# preseeding; partner will be automatically disabled if non-free
44-# software is disabled. For convenience, preseeding apt-setup/partner
45-# will automatically enable the respective service.
46+# All services are enabled by default to allow preseeding.
47 Template: apt-setup/services-select-ubuntu
48 Type: multiselect
49-Choices-C: security, partner
50-# SEC_HOST, and PARTNER_HOST are host names (e.g.
51-# security.ubuntu.com)
52+Choices-C: security
53+# SEC_HOST is a host name (e.g. security.ubuntu.com)
54 # Translators: the *entire* string should be under 55 columns
55 # including host name. In short, KEEP THIS SHORT and, yes, that's tricky
56 # :sl2:
57-__Choices: security updates (from ${SEC_HOST}), partner archive (from ${PARTNER_HOST}))
58+__Choices: security updates (from ${SEC_HOST})
59 Default: security
60 # :sl2:
61 _Description: Services to use:
62@@ -143,9 +139,6 @@ _Description: Services to use:
63 .
64 Security updates help to keep your system secured against attacks. Enabling
65 this service is strongly recommended.
66- .
67- The partner archive contains software provided by Canonical's partners as a
68- service to Ubuntu users.
69
70 Template: apt-setup/multiarch
71 Type: string
72diff --git a/d-i/source/apt-setup/generators/50mirror.ubuntu b/d-i/source/apt-setup/generators/50mirror.ubuntu
73index cd49ec7..e358c77 100755
74--- a/d-i/source/apt-setup/generators/50mirror.ubuntu
75+++ b/d-i/source/apt-setup/generators/50mirror.ubuntu
76@@ -61,12 +61,6 @@ while :; do
77 db_input low apt-setup/backports || true
78 ;;
79 5)
80- if (db_get apt-setup/restricted && [ "$RET" = true ]) || \
81- (db_get apt-setup/multiverse && [ "$RET" = true ]); then
82- db_input low apt-setup/partner || true
83- fi
84- ;;
85- 6)
86 db_input low apt-setup/enable-source-repositories || true
87 ;;
88 *)
89@@ -238,31 +232,4 @@ ${DEB} $protocol://$hostname$directory $codename-backports $alldists
90 ${DEB_SRC} $protocol://$srchostname$srcdirectory $codename-backports $alldists
91 EOF
92
93-if (db_get apt-setup/restricted && [ "$RET" = true ]) || \
94- (db_get apt-setup/multiverse && [ "$RET" = true ]) || \
95- (db_get apt-setup/partner && [ "$RET" = true ]); then
96- echo >> $file
97- if db_get apt-setup/partner && [ "$RET" = true ]; then
98- DEB='deb'
99- DEB_SRC="$deb_src"
100- else
101- cat >> $file <<EOF
102-## Uncomment the following two lines to add software from Canonical's
103-## 'partner' repository.
104-EOF
105- DEB='# deb'
106- DEB_SRC='# deb-src'
107- fi
108- cat >> $file <<EOF
109-## This software is not part of Ubuntu, but is offered by Canonical and the
110-## respective vendors as a service to Ubuntu users.
111-${DEB} http://archive.canonical.com/ubuntu $codename partner
112-${DEB_SRC} http://archive.canonical.com/ubuntu $codename partner
113-EOF
114-
115- if db_get apt-setup/partner && [ "$RET" = true ]; then
116- apt-setup-signed-release archive.canonical.com "$file"
117- fi
118-fi
119-
120 apt-setup-signed-release archive.ubuntu.com "$file"
121diff --git a/d-i/source/apt-setup/generators/90services-select b/d-i/source/apt-setup/generators/90services-select
122index 453d06c..bebc74b 100755
123--- a/d-i/source/apt-setup/generators/90services-select
124+++ b/d-i/source/apt-setup/generators/90services-select
125@@ -47,16 +47,8 @@ if ! db_get mirror/suite || [ -z "$RET" ]; then
126 fi
127 suite="$RET"
128
129-if (! db_get apt-setup/restricted || [ "$RET" = false ]) && \
130- (! db_get apt-setup/multiverse || [ "$RET" = false ]); then
131- disable_service partner
132-elif db_get apt-setup/partner && [ "$RET" = true ]; then
133- enable_service partner
134-fi
135-
136 db_get apt-setup/security_host
137 db_subst apt-setup/services-select-ubuntu SEC_HOST "$RET"
138-db_subst apt-setup/services-select-ubuntu PARTNER_HOST archive.canonical.com
139
140 db_input medium apt-setup/services-select-ubuntu || true
141 if ! db_go; then
142diff --git a/debian/changelog b/debian/changelog
143index e986077..9ae1a04 100644
144--- a/debian/changelog
145+++ b/debian/changelog
146@@ -1,3 +1,10 @@
147+ubiquity (22.04.5) UNRELEASED; urgency=medium
148+
149+ * Do not support setting up archive.canonical.com as a source; the partner
150+ archive is now obsolete. LP: #1959343.
151+
152+ -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 27 Jan 2022 16:13:33 -0800
153+
154 ubiquity (22.04.4) jammy; urgency=medium
155
156 [ Brian Murray ]
157diff --git a/debian/ubiquity.install-any b/debian/ubiquity.install-any
158index ce14626..c3c3bc5 100644
159--- a/debian/ubiquity.install-any
160+++ b/debian/ubiquity.install-any
161@@ -30,7 +30,6 @@ d-i/source/apt-setup/generators/90services-select usr/lib/ubiquity/apt-setup/gen
162 d-i/source/apt-setup/generators/91security usr/lib/ubiquity/apt-setup/generators
163 d-i/source/apt-setup/release-files/archive.ubuntu.com usr/share/apt-setup/release-files
164 d-i/source/apt-setup/release-files/security.ubuntu.com usr/share/apt-setup/release-files
165-d-i/source/apt-setup/release-files/archive.canonical.com usr/share/apt-setup/release-files
166 ubiquity/components/apt_setup.py usr/lib/ubiquity/ubiquity/components
167
168 # base-installer

Subscribers

People subscribed via source and target branches