Merge lp:~mwhudson/livecd-rootfs/live-server-no-openssh-server into lp:livecd-rootfs

Proposed by Michael Hudson-Doyle on 2018-12-10
Status: Merged
Merge reported by: Steve Langasek
Merged at revision: not available
Proposed branch: lp:~mwhudson/livecd-rootfs/live-server-no-openssh-server
Merge into: lp:livecd-rootfs
Diff against target: 37 lines (+11/-1) (has conflicts)
2 files modified
debian/changelog (+10/-0)
live-build/auto/config (+1/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~mwhudson/livecd-rootfs/live-server-no-openssh-server
Reviewer Review Type Date Requested Status
Simon Quigley 2018-12-10 Resubmit on 2019-04-20
Review via email: mp+360430@code.launchpad.net

Commit message

Do not include openssh-server in the base filsystem for the live server installer.

Description of the change

This will conflict with my other change in review, but not in any very interesting way.

To post a comment you must log in.
Balint Reczey (rbalint) wrote :

The target Bazaar branch is not active anymore.
Please resubmit the merge proposal against https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+ref/ubuntu/master .

Simon Quigley (tsimonq2) wrote :

Updating the status to reflect Balint's comment.

review: Resubmit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2018-12-10 22:15:42 +0000
3+++ debian/changelog 2018-12-12 00:56:46 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 livecd-rootfs (2.549) disco; urgency=medium
7
8 [ Tobias Koch ]
9@@ -6,6 +7,15 @@
10
11 -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 10 Dec 2018 14:15:34 -0800
12
13+=======
14+livecd-rootfs (2.549) UNRELEASED; urgency=medium
15+
16+ * Do not include openssh-server in the base filsystem for the live server
17+ installer.
18+
19+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Mon, 10 Dec 2018 13:21:34 +1300
20+
21+>>>>>>> MERGE-SOURCE
22 livecd-rootfs (2.548) disco; urgency=medium
23
24 * Key netplan delegation to NetworkManager on presence of
25
26=== modified file 'live-build/auto/config'
27--- live-build/auto/config 2018-12-10 08:18:02 +0000
28+++ live-build/auto/config 2018-12-12 00:56:46 +0000
29@@ -518,7 +518,7 @@
30 live)
31 add_task install standard
32 add_task install server
33- LIVE_TASK='cloud-image'
34+ add_package install cloud-init
35 case $ARCH in
36 amd64) add_package live linux-signed-generic ;;
37 esac

Subscribers

People subscribed via source and target branches