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

[Michael Hudson-Doyle]

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

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

[Balint Reczey (rbalint)]

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)]

Updating the status to reflect Balint's comment.

review: Needs Resubmitting

=== modified file 'debian/changelog'
--- debian/changelog	2018-12-10 22:15:42 +0000
+++ debian/changelog	2018-12-12 00:56:46 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 livecd-rootfs (2.549) disco; urgency=medium
 
   [ Tobias Koch ]
@@ -6,6 +7,15 @@
 
  -- Steve Langasek <[e-mail]>  Mon, 10 Dec 2018 14:15:34 -0800
 
+=======
+livecd-rootfs (2.549) UNRELEASED; urgency=medium
+
+  * Do not include openssh-server in the base filsystem for the live server
+    installer.
+
+ -- Michael Hudson-Doyle <[e-mail]>  Mon, 10 Dec 2018 13:21:34 +1300
+
+>>>>>>> MERGE-SOURCE
 livecd-rootfs (2.548) disco; urgency=medium
 
   * Key netplan delegation to NetworkManager on presence of
 
=== modified file 'live-build/auto/config'
--- live-build/auto/config	2018-12-10 08:18:02 +0000
+++ live-build/auto/config	2018-12-12 00:56:46 +0000
@@ -518,7 +518,7 @@
 			live)
 				add_task install standard
 				add_task install server
-				LIVE_TASK='cloud-image'
+				add_package install cloud-init
 				case $ARCH in
 					amd64)	add_package live linux-signed-generic ;;
 				esac