From 577646d435de9082462cda66f75722fd427f3bbb Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@ubuntu.com>
Date: Fri, 6 Oct 2017 12:52:43 +1300
Subject: [PATCH] Import patches-unapplied version 2.468 to
ubuntu/artful-proposed
Imported using git-ubuntu import.
Changelog parent: b05311165170c07d65bc27ea8edf27434c54efca
New changelog entries:
[ Dimitri John Ledkov ]
* Drop obsolete fix-ups of resolv.conf, debootstrap should now result in
correct symlink to resolved without any further fixes.
[ Michael Hudson-Doyle ]
* Have subiquity.service order after on a service defined by the subiquity
snap, which in turn will order after the job that mounts the subiquity
snap. (LP: #1721414)
---
debian/changelog | 13 +++++++++++++
.../ubuntu-core/includes.chroot/etc/resolv.conf | 1 -
.../includes.chroot/etc/resolv.conf | 1 -
.../ubuntu-server/hooks/99-fix-resolvconf.chroot | 3 ---
.../overlay/lib/systemd/system/subiquity.service | 2 +-
5 files changed, 14 insertions(+), 6 deletions(-)
delete mode 120000 live-build/ubuntu-core/includes.chroot/etc/resolv.conf
delete mode 120000 live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf
delete mode 100644 live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot
diff --git a/debian/changelog b/debian/changelog
index 946fbfad..de0d48ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+livecd-rootfs (2.468) artful; urgency=medium
+
+ [ Dimitri John Ledkov ]
+ * Drop obsolete fix-ups of resolv.conf, debootstrap should now result in
+ correct symlink to resolved without any further fixes.
+
+ [ Michael Hudson-Doyle ]
+ * Have subiquity.service order after on a service defined by the subiquity
+ snap, which in turn will order after the job that mounts the subiquity
+ snap. (LP: #1721414)
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Fri, 06 Oct 2017 12:52:43 +1300
+
livecd-rootfs (2.467) artful; urgency=medium
* fix remaining wrong references to /etc/default/grub.d/40-partuuid
diff --git a/live-build/ubuntu-core/includes.chroot/etc/resolv.conf b/live-build/ubuntu-core/includes.chroot/etc/resolv.conf
deleted file mode 120000
index 0141cbbf..00000000
--- a/live-build/ubuntu-core/includes.chroot/etc/resolv.conf
+++ /dev/null
@@ -1 +0,0 @@
-../run/resolvconf/resolv.conf
\ No newline at end of file
diff --git a/live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf b/live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf
deleted file mode 120000
index 0141cbbf..00000000
--- a/live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf
+++ /dev/null
@@ -1 +0,0 @@
-../run/resolvconf/resolv.conf
\ No newline at end of file
diff --git a/live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot b/live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot
deleted file mode 100644
index 9ed0a499..00000000
--- a/live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-ln -snf ../run/resolvconf/resolv.conf /etc/resolv.conf
diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service
index 5756d5b9..7baf00fa 100644
--- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service
+++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service
@@ -1,7 +1,7 @@
[Unit]
Description=Subiquity, the installer for Ubuntu Server
After=systemd-user-sessions.service plymouth-quit-wait.service
-After=rc-local.service
+After=rc-local.service snap.subiquity.started.service
Requires=snapd.service
IgnoreOnIsolate=yes
ConditionPathExists=/dev/tty0