Merge ~mwhudson/ubiquity:lp-1841672 into ubiquity:master

[Michael Hudson-Doyle]

Or we could just revert https://git.launchpad.net/ubiquity/commit/?id=c8a1cb57f77d8acdea350a549d1929c4b423a15d.

Not tested, and don't have time to test today. I have uploaded it to ppa:mwhudson/devirt though.

[Michael Hudson-Doyle (mwhudson)]

This doesn't seem to work, although I don't really understand why not :( Is /usr/lib/partman/finish.d/70crypto_aptinstall not executed for some reason? It gets mentioned in /var/log/partman though...

54a6d01... by Michael Hudson-Doyle on 2019-10-08

suppress output from apt-mark

[Michael Hudson-Doyle (mwhudson)]

Ah this doesn't work because 70crypto_aptinstall is called before the target filesystem is populated... but apt-install does write the file to /var/lib/ubiquity/apt-installed and the logic to install those packages can be fixed in the same way. Will have another MP momentarily.

[Michael Hudson-Doyle (mwhudson)]

https://code.launchpad.net/~mwhudson/ubiquity/+git/ubiquity/+merge/373809

Unmerged commits

54a6d01... by Michael Hudson-Doyle on 2019-10-08

suppress output from apt-mark

1cb42ed... by Michael Hudson-Doyle on 2019-10-08

compat/apt-install: Mark any packages already installed as manually installed. (LP: #1841672)

diff --git a/compat/apt-install b/compat/apt-install
index 81340ba..e6dbfe9 100755
--- a/compat/apt-install
+++ b/compat/apt-install
@@ -36,4 +36,9 @@ if [ -f /var/lib/ubiquity/apt-install-direct ]; then
 		setup_env
 		chroot /target apt-get $apt_get_args install $toinstall </dev/null
 	fi
+	# Mark any packages that are already installed as manually installed.
+	tomark="$(echo "$@" | xargs -n1 | sort | comm -12 - "$installed")"
+	if [ "$tomark" ]; then
+		chroot /target apt-mark manual $tomark </dev/null >/dev/null
+	fi
 fi
diff --git a/debian/changelog b/debian/changelog
index 3d67582..7ad4eac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ubiquity (19.10.16) UNRELEASED; urgency=medium
+
+  * compat/apt-install: Mark any packages already installed as manually
+    installed. (LP: #1841672)
+
+ -- Michael Hudson-Doyle <[e-mail]>  Tue, 08 Oct 2019 16:04:00 +1300
+
 ubiquity (19.10.15) eoan; urgency=medium
 
   [ Jean-Baptiste Lallement ]