diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-10-22 20:27:13 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-10-22 20:27:15 +0200 |
| commit | fe3333bcb6b6ae661b66bf817d1b48168a424a34 (patch) | |
| tree | f2ec27b878b9fee029ea573fbb11c7e8ae2fc736 /scripts/build/chroot_apt | |
| parent | 1fc33f6afb36d28b83dedabeca41cf3358a1ee18 (diff) | |
| download | vyos-live-build-fe3333bcb6b6ae661b66bf817d1b48168a424a34.tar.gz vyos-live-build-fe3333bcb6b6ae661b66bf817d1b48168a424a34.zip | |
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.
Diffstat (limited to 'scripts/build/chroot_apt')
| -rwxr-xr-x | scripts/build/chroot_apt | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt index f3cf3a7ac..62fbd4e67 100755 --- a/scripts/build/chroot_apt +++ b/scripts/build/chroot_apt @@ -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 |