diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-08-28 10:18:26 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2023-08-28 12:28:47 -0500 |
| commit | 93af10d71295ceda7baa23892f487c419700dafa (patch) | |
| tree | 1dac4f316008d16c379a7d7f0c7e45d26a427901 | |
| parent | bac61854acd40b4eae8b12e47be54306171f5c3c (diff) | |
| download | vyatta-cfg-system-93af10d71295ceda7baa23892f487c419700dafa.tar.gz vyatta-cfg-system-93af10d71295ceda7baa23892f487c419700dafa.zip | |
T5520: avoid cp from /config during update, after coreutils change
A change in behaviour of coreutils 'cp' reveals a problem when doing a
'cp -a' from the bind mount /config; use /opt/vyatta/etc/config instead.
| -rwxr-xr-x | scripts/install/install-image-existing | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing index feba6683..7cf0b4db 100755 --- a/scripts/install/install-image-existing +++ b/scripts/install/install-image-existing @@ -189,9 +189,9 @@ if [ $space_avail -gt $space_needed_configdata ]; then resp=$(get_response "Yes" "Yes No Y N") if [ "$resp" == 'yes' ] || [ "$resp" == 'y' ]; then echo 'Copying current configuration...' - ndir=${INST_ROOT}/${VYATTA_NEW_CFG_DIR} + ndir=${INST_ROOT}/${VYATTA_CFG_DIR} mkdir -p $ndir - find $VYATTA_NEW_CFG_DIR -maxdepth 1 -mindepth 1 \ + find $VYATTA_CFG_DIR -maxdepth 1 -mindepth 1 \ -exec cp '-a' '{}' "$ndir/" ';' # Set the upgraded flag @@ -201,7 +201,7 @@ if [ $space_avail -gt $space_needed_configdata ]; then chmod -R 775 $ndir # Return original permissions for private files in config/auth. T2713 - rsync -a ${VYATTA_NEW_CFG_DIR}/auth/ ${ndir}/auth/ + rsync -a ${VYATTA_CFG_DIR}/auth/ ${ndir}/auth/ fi done |