Bug#685791: live-build: apt.conf.d files support

[Thanatermesis <thanatermesis@gmail.com>]

Package: live-build
Version: 3.0~a57-1
Severity: wishlist
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

- -- Package-specific info:

- -- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-3-686-pae (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages live-build depends on:
ii  debootstrap  1.0.42

Versions of packages live-build recommends:
ii  cpio                            2.11-8
ii  gnu-fdisk                       1.2.4-3.1
ii  live-boot-doc                   3.0~a35-1
ii  live-config-doc                 3.0~a33-1
ii  live-manual-html [live-manual]  1:3.0~a13-1

Versions of packages live-build suggests:
ii  dosfstools       3.0.13-1
ii  fakeroot         1.18.4-2
ii  genisoimage      9:1.1.11-2
ii  git              1:1.7.10.4-1
ii  memtest86+       4.20-1.1
ii  mtools           4.0.17-1
pn  parted           <none>
ii  squashfs-tools   1:4.2-5
ii  sudo             1.8.5p2-1
pn  syslinux | grub  <none>
pn  uuid-runtime     <none>
pn  win32-loader     <none>

- -- no debconf information

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJQN5bKAAoJEKLHmb/f+NfCQyEP/1ByDxot5TetlE4A6TUdAxtU
6WTwhyJsCi//J0XEAcTKE57i1ofhAuQgVLEPgLjU0tIDE/OAB5Z7olQD6dAwSw3m
LAUaVK4XAXOdqp7BB72BxEXyFfjBlCu+jgY/LCAdbVQG7FXxneoLwHWnhKor92yU
VJv2/1C8TSt1nc06CCYMCSmtRdWmajv6XtWt0f1qfWN07DLaebjjqjH27NS4swTJ
X+m3HatF1sSI5LWnsnW9malCKJtuor0xwZ1hKKHJHLWLAUt2R2vipekFfo/6jHSW
BWQidYv3L/HLlbBsX6nWzb151IufQ+urBlsExdgcfpRtCepPTgvizvqPRjVYOwbS
yNhPp0f8YRMdzHBOxgkQiEYyAIKHIh1QD1lrFuZSSXfMrlE7AD+rtuCBOjbmI0Km
yZZsJyY6zIYL3D6kMFuo+Jezq7+8qYAfnpuDaSdc1ODh2FtLeSUWCH1yf0gCn41O
CNUAfQs6UFDApwcdq4wCwGN1P1bljzCEDNPzUYYq/Fs4AQszLZ4l/9+ewaf8Vpry
gkDF+NR2/bvo9gVqoY9044fodogypxF1E/Ugmu754lIYD5srLpExl9t39/IZNVq7
C0yZu5BqkS4WDwSQBzkuDTMMDXLa88Jc2UuHIHIRqWqf3f347x3n3VypQ+B4CVmH
QTSb/syMMYWtKERmVVX2
=W0Hf
-----END PGP SIGNATURE-----

--- a/scripts/build/lb_chroot_apt
+++ b/scripts/build/lb_chroot_apt
@@ -121,6 +121,19 @@ case "${1}" in
 			done
 		fi
 
+		if Find_files config/chroot_apt/*.conf
+		then
+			for _FILE in config/chroot_apt/*.conf
+			do
+				if [ -f chroot/etc/apt/apt.conf.d/$(basename ${_FILE}) ]
+				then
+					mv chroot/etc/apt/apt.conf.d/$(basename ${_FILE}) chroot/etc/apt/apt.conf.d/$(basename ${_FILE}).orig
+				fi
+
+				cp -aL ${_FILE} chroot/etc/apt/apt.conf.d
+			done
+		fi
+
 		if Find_files config/packages.chroot/*.deb || Find_files config/packages/*.deb
 		then
 			echo >> chroot/etc/apt/preferences
@@ -304,6 +317,24 @@ EOF
 				fi
 			done
 		fi
+
+		if Find_files config/chroot_apt/*.conf
+		then
+			for _FILE in config/chroot_apt/*.conf
+			do
+				if [ -f chroot/etc/apt/apt.conf.d/$(basename ${_FILE}) ]
+				then
+					mv chroot/etc/apt/apt.conf.d/$(basename ${_FILE}) chroot/etc/apt/apt.conf.d/$(basename ${_FILE}).orig
+				fi
+
+				cp -aL ${_FILE} chroot/etc/apt/apt.conf.d
+
+				if [ -f chroot/etc/apt/apt.conf.d/$(basename ${_FILE}) ]
+				then
+					mv chroot/etc/apt/apt.conf.d/$(basename ${_FILE}).orig chroot/etc/apt/apt.conf.d/$(basename ${_FILE})
+				fi
+			done
+		fi
 
 		if Find_files config/packages.chroot/*.deb || Find_files config/packages/*.deb
 		then