Casper

Merge ~mwhudson/casper:reenable-apt-cdrom-server into casper:main

  1. Git
  2. lp:~mwhudson/casper
  3. reenable-apt-cdrom-server
  4. Merge into main
Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 9ca7f5ffc9ad7806727d1978b58c20085daf4363
Proposed branch: ~mwhudson/casper:reenable-apt-cdrom-server
Merge into: casper:main
Diff against target: 31 lines (+6/-6)
2 files modified
debian/changelog (+6/-0)
scripts/casper-bottom/41apt_cdrom (+0/-6)
Reviewer Review Type Date Requested Status
Ubuntu Installer Team Pending
Review via email: mp+403846@code.launchpad.net

Commit message

Reenable apt-cdrom on a live-server ISO.

Description of the change

Slightly comically as soon as I disabled apt-cdrom for the live server ISO after years of it running useless I have a use for it: installing wpasupplicant in the live installer environment so we can configure wifi cards via netplan.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index f606c26..3751509 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+casper (1.462) UNRELEASED; urgency=medium
7+
8+ * Reenable apt-cdrom on a live-server ISO.
9+
10+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Tue, 08 Jun 2021 15:52:26 +1200
11+
12 casper (1.461) hirsute; urgency=medium
13
14 [ Gunnar Hjalmarsson ]
15diff --git a/scripts/casper-bottom/41apt_cdrom b/scripts/casper-bottom/41apt_cdrom
16index 3600eb3..eaaf985 100755
17--- a/scripts/casper-bottom/41apt_cdrom
18+++ b/scripts/casper-bottom/41apt_cdrom
19@@ -18,12 +18,6 @@ esac
20
21 . /scripts/casper-functions
22
23-case "$USERNAME" in
24- ubuntu-server)
25- exit 0
26- ;;
27-esac
28-
29 log_begin_msg "$DESCRIPTION"
30
31 # apt-cdrom would fail otherwise

Subscribers

People subscribed via source and target branches