Package: live-build
Version: 3.0~a51-1
Followup-For: Bug #685924
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Actually I don't know why this report still open, It is a patch for
solve a clear bug about duplicated/extra lines that was made by too-fast
copy-paste in development, a newer updated patch is attached to this
email in order to be applied to 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)
iQIcBAEBCAAGBQJQopFKAAoJEKLHmb/f+NfCFRgQAJfaAkOiqxdWYUEOKNdMJiGg
+AY5s521cz4p9w4LzDDqhu1hZY/7QZXzw/sW4vHrvV128ayzC7K0Y9xQZ1SzuDMe
iBianylMAPTHo6dQzuHuLpf5TlqEk8bpBzoJJXbOn8615iDfVquUs0kZsp8JAA3B
sQWrIEZEnNOlexo1VpCvYh+j7DmcCtC/TsFrUldGdsCiukqilsVMUEWy63tT+0ZB
g69yDy++ICfiUD5RgWFC0swtXmPLBYEMzfgCLUIGSA3Pi3gGg+kyIYHw1e36G4bJ
iiZpWh3YOIhQnS84LcRFs9Wl1rfsFZ3I6cd7joPmtn/2COBBN4VfkXAro/ln+MRG
QlWj6DBJOu6LDtnAw2bdLc43fIr7Q3hMrv3FFT5JGOtd7R6mgCKz6nE0fLjRKmzn
C5gXdcNvY2nIFcMlDxb/zU4ubuDXlbGq8596G7tOAgYFXWaIxDgpTielJSPJhBI2
YpyUxi1FjE4/sk/rnaP3eMIOdyXLhQ2ayWd4U/XqBkKkfPBo0Vm/A/Hrv0FTUzi0
RDeLkQGbBRbhhbk8brtPrxofAFnx/jHa/fVVgOLbGb7KxPqIqBAgV5ca/yKpGFPq
yEDtMRbe4Gc2ffJgJWJq+WTDNrL8PZGp8+C/zDdT2dgRo8PTNIu0b95SWevZabT0
d/E1FdHg0+i1rJUynJOm
=/EHk
-----END PGP SIGNATURE-----
--- a/scripts/build/chroot_apt
+++ b/scripts/build/chroot_apt
@@ -255,16 +255,9 @@ EOF
rm -f chroot/etc/apt/apt.conf.d/00secure
fi
- # Configuring apt config
+ # Deconfiguring apt config
if [ -f config/apt/apt.conf ]
then
- if [ -f chroot/etc/apt/apt.conf ]
- then
- mv chroot/etc/apt/apt.conf chroot/etc/apt/apt.conf.orig
- fi
-
- cp config/apt/apt.conf chroot/etc/apt/apt.conf
-
if [ -f chroot/etc/apt/apt.conf.orig ]
then
mv chroot/etc/apt/apt.conf.orig chroot/etc/apt/apt.conf
@@ -274,31 +267,18 @@ EOF
# Deconfiguring apt preferences
if [ -f config/apt/preferences ]
then
- if [ -f chroot/etc/apt/preferences ]
- then
- mv chroot/etc/apt/preferences chroot/etc/apt/preferences.orig
- fi
-
- cp config/apt/preferences chroot/etc/apt/preferences
-
if [ -f chroot/etc/apt/preferences.orig ]
then
mv chroot/etc/apt/preferences.orig chroot/etc/apt/preferences
fi
fi
+ # Deconfiguring apt preferences.d
if Find_files config/apt/*.pref
then
for _FILE in config/apt/*.pref
do
- if [ -f chroot/etc/apt/preferences.d/$(basename ${_FILE}) ]
- then
- mv chroot/etc/apt/preferences.d/$(basename ${_FILE}) chroot/etc/apt/preferences.d/$(basename ${_FILE}).orig
- fi
-
- cp -aL ${_FILE} chroot/etc/apt/preferences.d
-
- if [ -f chroot/etc/apt/preferences.d/$(basename ${_FILE}) ]
+ if [ -f chroot/etc/apt/preferences.d/$(basename ${_FILE}).orig ]
then
mv chroot/etc/apt/preferences.d/$(basename ${_FILE}).orig chroot/etc/apt/preferences.d/$(basename ${_FILE})
fi
