[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#685791: marked as done (support apt.conf.d in lb_chroot_apt)

Your message dated Thu, 06 Dec 2012 21:03:58 +0000
with message-id <E1Tgibu-0006vW-9O@franck.debian.org>
and subject line Bug#685791: fixed in live-build 4.0~a2-1
has caused the Debian Bug report #685791,
regarding support apt.conf.d in lb_chroot_apt
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
685791: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685791
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
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

--- End Message ---
--- Begin Message --- 
Source: live-build
Source-Version: 4.0~a2-1

We believe that the bug you reported is fixed in the latest version of
live-build, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 685791@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Daniel Baumann <daniel@debian.org> (supplier of updated live-build package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Thu, 06 Dec 2012 21:17:32 +0100
Source: live-build
Binary: live-build live-build-cgi
Architecture: source all
Version: 4.0~a2-1
Distribution: experimental
Urgency: low
Maintainer: Debian Live Project <debian-live@lists.debian.org>
Changed-By: Daniel Baumann <daniel@debian.org>
Description: 
 live-build - Live System Build Scripts
 live-build-cgi - Live System Build Scripts (CGI frontend)
Closes: 685791 695091
Changes: 
 live-build (4.0~a2-1) experimental; urgency=low
 .
   * Removing some leftovers from stripped and minimal package lists.
   * Updating powerpc kernel list on ubuntu.
   * Adding dropped empty-line separator in defaults.
   * Adding dropped empty-line separator in binary_debian-installer.
   * Updating version config tree version check (Closes: #695091).
   * Updating wording about regenerating config trees.
   * Harmonizing apt configuration handling in chroot_archives.
   * Adding support for local apt conf.d snippets in archive definitions
     (Closes: #685791).
   * Ensuring that functions are either sources locally or globally, but
     not both.
   * Adding proper header to build.sh include.
   * Dropping ubuntu guards on firmware selection code, we're not enabling
     firmware inclusion in ubuntu mode anyway.
   * Adding 3.0~a69-1 changelog entries.
Checksums-Sha1: 
 afbec4ac5f3bd814a3a8354f5878a87d46ee7fbb 1322 live-build_4.0~a2-1.dsc
 3a17bb704a7315ece620c3d87d8df32474311b74 162280 live-build_4.0~a2.orig.tar.xz
 4f71d4db292e301990b5f99382f79f60f0cc87d7 49972 live-build_4.0~a2-1.debian.tar.xz
 569ce19b1ce99b0842ebed04154aef6466d24620 195698 live-build_4.0~a2-1_all.deb
 4a6c9ad5e82796072d2f259715e16678b0b5d321 74168 live-build-cgi_4.0~a2-1_all.deb
Checksums-Sha256: 
 e46b4d89bbd7fc4d97841ccbf2126593041dda66d0d286547972466229a9e044 1322 live-build_4.0~a2-1.dsc
 4d55e86c82e67318dd7e75203196de06b841373e528dae9c1f005e2bad2e1d71 162280 live-build_4.0~a2.orig.tar.xz
 f174835559b390dcdf7abce096f2f6bf3913dd9294e7591c2d054bb079b79bb3 49972 live-build_4.0~a2-1.debian.tar.xz
 2b38a8c8d00b92a4bf560342868133c6a7b9346b452dcfa193d1145f64807a68 195698 live-build_4.0~a2-1_all.deb
 b5dc088a707f536407bd71db195b9f291d0b359f86a1ddb5db5960b83f8d65e9 74168 live-build-cgi_4.0~a2-1_all.deb
Files: 
 1417c733f41c6e63f87d5f76b8ab29ec 1322 misc optional live-build_4.0~a2-1.dsc
 b6db4f222de8aa393e0c92d303dc75c6 162280 misc optional live-build_4.0~a2.orig.tar.xz
 87a8d876b5963b7f65c4375c5f2f8a85 49972 misc optional live-build_4.0~a2-1.debian.tar.xz
 ce6ba55b98ca18bb555b972b071734ed 195698 misc optional live-build_4.0~a2-1_all.deb
 f55349a9d5e46b7b53326c73e417e436 74168 misc optional live-build-cgi_4.0~a2-1_all.deb

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

iEUEARECAAYFAlDA/esACgkQ+C5cwEsrK56jCwCfXlpykKkPO/PtKDDnNATPC2/U
Wb4Al1qTZniPxVCj35ZzIlxYAxtKQmc=
=1nAw
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: