summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2014-12-10 07:56:10 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2014-12-10 07:56:10 +0100
commit57dd8c6376e58cc08ddd6c041bd0fa2fdeae6c34 (patch)
tree167904b752bfa76aa5643097ea2ada0efe9e1080
parent703b6d1f1f00a9b6902270a75e04aaf2065dec5b (diff)
downloadvyos-live-build-57dd8c6376e58cc08ddd6c041bd0fa2fdeae6c34.tar.gz
vyos-live-build-57dd8c6376e58cc08ddd6c041bd0fa2fdeae6c34.zip
Correcting typo in apt.conf.d directory name, thanks to jnqnfe <jnqnfe@gmail.com> (Closes: #771392).
-rwxr-xr-xscripts/build/bootstrap_archives2
-rwxr-xr-xscripts/build/chroot_archives6
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/bootstrap_archives b/scripts/build/bootstrap_archives
index 2eff84695..c2e37db27 100755
--- a/scripts/build/bootstrap_archives
+++ b/scripts/build/bootstrap_archives
@@ -204,7 +204,7 @@ for FILE in config/archives/*.conf config/archives/*.conf.chroot
do
if [ -e "${FILE}" ]
then
- cp ${FILE} chroot/etc/apt/conf.d/$(basename ${FILE} .chroot)
+ cp ${FILE} chroot/etc/apt/apt.conf.d/$(basename ${FILE} .chroot)
fi
done
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index 4e0a0ebb8..44483206d 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -205,7 +205,7 @@ EOF
do
if [ -e "${FILE}" ]
then
- cp ${FILE} chroot/etc/apt/conf.d/$(basename ${FILE} .chroot)
+ cp ${FILE} chroot/etc/apt/apt.conf.d/$(basename ${FILE} .chroot)
fi
done
@@ -687,7 +687,7 @@ EOF
do
if [ -e "${FILE}" ]
then
- rm -f "chroot/etc/apt/conf.d/$(basename ${FILE} .chroot)"
+ rm -f "chroot/etc/apt/apt.conf.d/$(basename ${FILE} .chroot)"
fi
done
@@ -724,7 +724,7 @@ EOF
do
if [ -e "${FILE}" ]
then
- cp ${FILE} chroot/etc/apt/conf.d/$(basename ${FILE} .binary)
+ cp ${FILE} chroot/etc/apt/apt.conf.d/$(basename ${FILE} .binary)
fi
done