From f27b432026f5f66859c99663a52839fba79d646b Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Fri, 13 Dec 2019 09:01:30 +1300
Subject: [PATCH] ubuntu-cpc hooks are Different

---
 live-build/auto/config                                    | 4 +++-
 .../hooks.d/chroot/100-preserve-apt-prefs.chroot          | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100755 live-build/ubuntu-cpc/hooks.d/chroot/100-preserve-apt-prefs.chroot

diff --git a/live-build/auto/config b/live-build/auto/config
index cb995a21..0b50f0ff 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1096,7 +1096,8 @@ rm -f /etc/fstab
 EOF
 fi
 
-cat > config/hooks/100-preserve-apt-prefs.chroot <<EOF
+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
@@ -1106,6 +1107,7 @@ 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
diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/100-preserve-apt-prefs.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/100-preserve-apt-prefs.chroot
new file mode 100755
index 00000000..ff5afc27
--- /dev/null
+++ b/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