manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renaming config/chroot_apt to simply config/apt. 

Eventually lb_chroot_apt will be folded into chroot_archives
but that's left for after wheezy.
This commit is contained in:
Daniel Baumann 2012-10-22 20:27:13 +02:00
parent 1fc33f6afb
commit fe3333bcb6
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/build/chroot_apt
View File

@ -87,30 +87,30 @@ case "${1}" in
esac
# Configuring apt config
if [ -f config/chroot_apt/apt.conf ]
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/chroot_apt/apt.conf chroot/etc/apt/apt.conf
cp config/apt/apt.conf chroot/etc/apt/apt.conf
fi
# Configuring apt preferences
if [ -f config/chroot_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/chroot_apt/preferences chroot/etc/apt/preferences
cp config/apt/preferences chroot/etc/apt/preferences
fi
if Find_files config/chroot_apt/*.pref
if Find_files config/apt/*.pref
then
for _FILE in config/chroot_apt/*.pref
for _FILE in config/apt/*.pref
do
if [ -f chroot/etc/apt/preferences.d/$(basename ${_FILE}) ]
then
@ -256,14 +256,14 @@ EOF
fi
# Configuring apt config
if [ -f config/chroot_apt/apt.conf ]
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/chroot_apt/apt.conf chroot/etc/apt/apt.conf
cp config/apt/apt.conf chroot/etc/apt/apt.conf
if [ -f chroot/etc/apt/apt.conf.orig ]
then
@ -272,14 +272,14 @@ EOF
fi
# Deconfiguring apt preferences
if [ -f config/chroot_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/chroot_apt/preferences chroot/etc/apt/preferences
cp config/apt/preferences chroot/etc/apt/preferences
if [ -f chroot/etc/apt/preferences.orig ]
then
@ -287,9 +287,9 @@ EOF
fi
fi
if Find_files config/chroot_apt/*.pref
if Find_files config/apt/*.pref
then
for _FILE in config/chroot_apt/*.pref
for _FILE in config/apt/*.pref
do
if [ -f chroot/etc/apt/preferences.d/$(basename ${_FILE}) ]
then

4
scripts/build/config
View File

@ -190,7 +190,7 @@ Local_arguments ()
Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
# Dump contents of directories that contain text files
for DIRECTORY in config/package-lists config/chroot_apt config/preseed config/binary_rootfs
for DIRECTORY in config/package-lists config/apt config/preseed config/binary_rootfs
do
if Find_files "${DIRECTORY}"
then
@ -1224,7 +1224,7 @@ EOF
# Creating lb_chroot_* configuration
mkdir -p config/archives
mkdir -p config/chroot_apt
mkdir -p config/apt
mkdir -p config/hooks
mkdir -p config/includes.chroot
mkdir -p config/packages