diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-01-09 16:17:31 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:35 +0100 |
| commit | c83edb91347b50275893b71ec307b8f69dc8e3db (patch) | |
| tree | afae0cbf4c304f62aebd85026849a726ceb5dcce | |
| parent | b211776641d833c08373eb07e686e0f06adc81e7 (diff) | |
| download | vyos-live-build-c83edb91347b50275893b71ec307b8f69dc8e3db.tar.gz vyos-live-build-c83edb91347b50275893b71ec307b8f69dc8e3db.zip | |
Also handling custom apt.conf in config/chroot_apt/apt.conf to allow further apt configuration (Closes: #511247).
| -rwxr-xr-x | helpers/lh_chroot_apt | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt index b82e3ee89..f7adb0702 100755 --- a/helpers/lh_chroot_apt +++ b/helpers/lh_chroot_apt @@ -101,6 +101,17 @@ case "${1}" in ;; esac + # Configuring apt config + if [ -f config/chroot_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/chroot_apt/apt.conf chroot/etc/apt/apt.conf + fi + # Configuring apt preferences if [ -f config/chroot_apt/preferences ] then @@ -182,6 +193,17 @@ case "${1}" in rm -f chroot/etc/apt/apt.conf.d/00secure fi + # Configuring apt config + if [ -f config/chroot_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/chroot_apt/apt.conf chroot/etc/apt/apt.conf + fi + # Deconfiguring apt preferences if [ -f chroot/etc/apt/preferences.orig ] then |