Merge branch 'lp-1855354' into ubuntu/master

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.635) UNRELEASED; urgency=medium
+
+  * Preserve apt preferences created by any package we install (i.e.
+    ubuntu-advantage-tools) against live-build's attempt to delete them.
+    (LP: #1855354)
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 12 Dec 2019 12:55:17 +1300
+
 livecd-rootfs (2.634) focal; urgency=medium
 
   * Only build bootable buildd images for amd64.

live-build/auto/build

@@ -314,6 +314,12 @@ EOF
 		undivert_grub chroot
 	fi
 
+	if [ -d chroot/etc/apt/preferences.d.save ]; then
+		# https://twitter.com/infinite_scream
+		mv chroot/etc/apt/preferences.d.save/* chroot/etc/apt/preferences.d/
+		rmdir chroot/etc/apt/preferences.d.save
+	fi
+
 	# Let all configuration non multi-layered project here.
 	# If those are moving to a multi-layer layout, this needs to be
 	# done in chroot hooks.

live-build/auto/config

@@ -1096,6 +1096,19 @@ rm -f /etc/fstab
 EOF
 fi
 
+if [ $PROJECT != ubuntu-cpc ]; then
+	cat > config/hooks/100-preserve-apt-prefs.chroot <<\EOF
+#! /bin/sh -ex
+
+# live-build "helpfully" removes /etc/apt/preferences.d/* so we put a
+# copy somewhere it won't touch it.
+
+if [ -n "$(ls -A /etc/apt/preferences.d)" ]; then
+    cp -a /etc/apt/preferences.d /etc/apt/preferences.d.save
+fi
+EOF
+fi
+
 if [ $PROJECT = ubuntukylin ]; then
 	cat > config/hooks/100-ubuntukylin.chroot <<EOF
 #! /bin/sh

live-build/ubuntu-cpc/hooks.d/chroot/100-preserve-apt-prefs.chroot

@@ -0,0 +1,8 @@
+#! /bin/sh -ex
+
+# live-build "helpfully" removes /etc/apt/preferences.d/* so we put a
+# copy somewhere it won't touch it.
+
+if [ -n "$(ls -A /etc/apt/preferences.d)" ]; then
+    cp -a /etc/apt/preferences.d /etc/apt/preferences.d.save
+fi