diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-10-25 13:36:12 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-10-25 13:36:18 +0200 |
| commit | 2caef33ea285353fb74f88b611e90fcc2b8b7092 (patch) | |
| tree | 8382ff92c03b144fd3e8f3badbcb8d9a31584435 /scripts/build/chroot_apt | |
| parent | 743cf9775d1906e46d524dfdc566ae48ee6d3b00 (diff) | |
| download | vyos-live-build-2caef33ea285353fb74f88b611e90fcc2b8b7092.tar.gz vyos-live-build-2caef33ea285353fb74f88b611e90fcc2b8b7092.zip | |
Renaming progress mode to progress-linux to match the used naming scheme.
Diffstat (limited to 'scripts/build/chroot_apt')
| -rwxr-xr-x | scripts/build/chroot_apt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt index 62fbd4e67..b31ab94ba 100755 --- a/scripts/build/chroot_apt +++ b/scripts/build/chroot_apt @@ -147,8 +147,8 @@ case "${1}" in fi case "${LB_MODE}" in - progress) - if [ ! -e chroot/etc/apt/preferences.d/progress.pref ] + progress-linux) + if [ ! -e chroot/etc/apt/preferences.d/progress-linux.pref ] then _DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')" @@ -184,7 +184,7 @@ case "${1}" in for _DISTRIBUTION in ${_ENABLE_DISTRIBUTIONS} do -cat >> chroot/etc/apt/preferences.d/progress.pref << EOF +cat >> chroot/etc/apt/preferences.d/progress-linux.pref << EOF Package: * Pin: release n=${_DISTRIBUTION} @@ -196,7 +196,7 @@ EOF for _DISTRIBUTION in ${_DISABLE_DISTRIBUTIONS} do -cat >> chroot/etc/apt/preferences.d/progress.pref << EOF +cat >> chroot/etc/apt/preferences.d/progress-linux.pref << EOF #Package: * #Pin: release n=${_DISTRIBUTION} @@ -209,7 +209,7 @@ EOF case "${LB_DISTRIBUTION}" in artax-backports) -cat >> chroot/etc/apt/preferences.d/progress.tmp.pref << EOF +cat >> chroot/etc/apt/preferences.d/progress-linux.tmp.pref << EOF Package: squashfs-tools Pin: release n=squeeze Pin-Priority: 1001 @@ -323,7 +323,7 @@ EOF fi # Remove temporary hack to avoid squashfs version mismatch for artax-backports - rm -f chroot/etc/apt/preferences.d/progress.tmp.pref + rm -f chroot/etc/apt/preferences.d/progress-linux.tmp.pref # Removing stage file rm -f .build/chroot_apt |