Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[updategraph] After system upgrade, restore files/directories with original attributes etc. #2368

Merged
merged 2 commits into from
Feb 2, 2019
+8 −8
Merged

[updategraph] After system upgrade, restore files/directories with original attributes etc. #2368

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09e2e54
[updategraph] After system upgrade, restore files/directories with
zhenggen-xu Dec 8, 2018
ec5978e
Removed deployment_id_asn_map.yml from copy list
zhenggen-xu Jan 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions files/image_config/updategraph/updategraph
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ reload_minigraph()
pfcwd start_default
}

function copy_config_files()
function copy_config_files_and_directories()
{
for file in $@; do
if [ -f /etc/sonic/old_config/${file} ]; then
logger "Copying SONiC configuration ${file} ..."
cp /etc/sonic/old_config/${file} /etc/sonic/
for file_dir in $@; do
if [ -f /etc/sonic/old_config/${file_dir} ] || [ -d /etc/sonic/old_config/${file_dir} ]; then
logger "Copying SONiC configuration ${file_dir} ..."
cp -ar /etc/sonic/old_config/${file_dir} /etc/sonic/
else
logger "Missing SONiC configuration ${file} ..."
logger "Missing SONiC configuration ${file_dir} ..."
fi
done
}
Expand All @@ -50,9 +50,9 @@ fi
. /etc/sonic/updategraph.conf

check_system_warm_boot

copy_list="minigraph.xml snmp.yml acl.json config_db.json frr"
if [ -f /tmp/pending_config_migration ]; then
copy_config_files minigraph.xml snmp.yml acl.json config_db.json
copy_config_files_and_directories $copy_list
if [ x"${WARM_BOOT}" == x"true" ]; then
echo "Warm reboot detected..."
elif [ "$enabled" = "true" ]; then
Expand Down