diff options
| author | Raphaël Hertzog <hertzog@debian.org> | 2020-04-24 17:02:15 +0200 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-24 17:09:10 +0200 |
| commit | c6428f44e38724991e4efa01c512876fbd13badc (patch) | |
| tree | 8017b57674f01c35982491b518b327d215971c83 /scripts/build | |
| parent | 41ca745b6cf8b506408082453cbabd0616a62d44 (diff) | |
| download | vyos-live-build-c6428f44e38724991e4efa01c512876fbd13badc.tar.gz vyos-live-build-c6428f44e38724991e4efa01c512876fbd13badc.zip | |
Use correct variable name to detect removal step
Due to this mistake, the helpers were not called in reverse order
during the removal step. This lead to things like "apt update" failing
because a broken /etc/resolv.conf has been restored before the call
to "chroot_archives remove".
Gbp-Dch: Ignore
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/chroot_prep | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/build/chroot_prep b/scripts/build/chroot_prep index 8de0e4e29..f9ebdea5f 100755 --- a/scripts/build/chroot_prep +++ b/scripts/build/chroot_prep @@ -98,7 +98,7 @@ if In_list "archives" ${HELPERS} && [ ! -e .build/bootstrap ]; then Echo_warning "The 'archives' helper is selected, but the bootstrap stage has not completed." fi -if [ "${_ACTION}" = "remove" ]; then +if [ "${ACTION}" = "remove" ]; then HELPERS_REVERSED="" for HELPER in $HELPERS; do HELPERS_REVERSED="${HELPER}${HELPERS_REVERSED:+ $HELPERS_REVERSED}" |