Package: live-build Version: 3.0~a51-1 Followup-For: Bug #685791 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
Updated patch for the SID version - -- 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~a43-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 memtest86+ 4.20-1.1 ii mtools 4.0.17-1 ii parted 2.3-11 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) iQIcBAEBCAAGBQJQopTeAAoJEKLHmb/f+NfC3eYP/1+DAlPrMs73uuHaJsFfZc+U hGjqCzSv3uD0PekIxBOXo6luQfXSEDY77xzMCXvjH8ZFFtW318H2Q2TjD3UWo7YX nH3+x65KznQfFov+5XOMXyaHqCae5r5Gi5uPnorkD3t5hvNEA6jcbKJxddHxR6Tt OLQod93g8Uxj3L2q+QtY0cOm/TgMsl/c6gULSa+4S1Ss1oOnrwKd7jUyTTfGuwfg gS/LMUfn+RbrRUU9TekiP0PnkMlTOct/1CE/KP8LUD4aDG8+f74xjzxVBw0CE1PQ bZbTdosuocpJ8hrq7yhDcnYw8QdhVkEahO2ORQS+p+kwbiXBAtCgAWesOViaDJjL n8KukjidzdkGd9LczzSIuQ5CYkzG1XuaXCFRf6zvdgpB4gnMAgXRZa4ye2ppgus2 SktOJ9BYBKaXrCBEkMqeGkGRUjnOg0BR8weLHq1AQwec6brjR1uNf9SS0HMgT0+z B6JgkvdhU8n9a5wOzmo/ZJN17KBFPTwfg82B2DqFMUCHB/dQSi4rcW6TPrexuLxl JXMxPD6oteKyfVIEPGmQUPnyn5K9HIHrBTfBrLiwQle3WzmXdnwQDxnGBOkjkmKN mkjzE55vh8zxDxnwazJJcKDiq6OtiVl0BuQxXbTO54jDb2zfTdsqNvbf8ITikAc9 aTBod+rrzWTdVJHx4QCW =fmlz -----END PGP SIGNATURE-----
--- a/scripts/build/chroot_apt +++ b/scripts/build/chroot_apt @@ -97,6 +97,20 @@ case "${1}" in cp config/apt/apt.conf chroot/etc/apt/apt.conf fi + # Configuring apt conf.d + if Find_files config/apt/*.conf + then + for _FILE in config/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 + # Configuring apt preferences if [ -f config/apt/preferences ] then @@ -264,6 +278,18 @@ EOF fi fi + # Deconfiguring apt conf.d + if Find_files config/apt/*.conf + then + for _FILE in config/apt/*.conf + do + if [ -f chroot/etc/apt/apt.conf.d/$(basename ${_FILE}).orig ] + then + mv chroot/etc/apt/apt.conf.d/$(basename ${_FILE}).orig chroot/etc/apt/apt.conf.d/$(basename ${_FILE}) + fi + done + fi + # Deconfiguring apt preferences if [ -f config/apt/preferences ] then