matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[aboot]: preserve snmp.yml and acl.json for eos to sonic fast reboot (#3716)

Browse Source
This commit is contained in:
lguohan 2019-11-06 20:18:31 -08:00 committed by Ying Xie
parent b9b56c91ff
commit 9167f9da46
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/Aboot/boot0.j2
View File

@ -92,7 +92,9 @@ clean_flash() {
[ $f != "$cmdline_base" ] && [ $f != "$cmdline_base" ] &&
[ $f != "aquota.user" ] && [ $f != "aquota.user" ] &&
[ $f != "old_config" ] && [ $f != "old_config" ] &&
[ $f != "minigraph.xml" ] [ $f != "minigraph.xml" ] &&
[ $f != "snmp.yml" ] &&
[ $f != "acl.json" ]
then then
rm -rf "$target_path/$f" rm -rf "$target_path/$f"
fi fi

2
files/image_config/platform/rc.local
View File

@ -223,6 +223,8 @@ if [ -f $FIRST_BOOT_FILE ]; then
elif [ -f /host/minigraph.xml ]; then elif [ -f /host/minigraph.xml ]; then
mkdir -p /etc/sonic/old_config mkdir -p /etc/sonic/old_config
mv /host/minigraph.xml /etc/sonic/old_config/ mv /host/minigraph.xml /etc/sonic/old_config/
[ -f /host/acl.json ] && mv /host/acl.json /etc/sonic/old_config/
[ -f /host/snmp.yml ] && mv /host/snmp.yml /etc/sonic/old_config/
touch /tmp/pending_config_migration touch /tmp/pending_config_migration
elif [ -n "$migration" ] && [ -f /host/migration/minigraph.xml ]; then elif [ -n "$migration" ] && [ -f /host/migration/minigraph.xml ]; then
mkdir -p /etc/sonic/old_config mkdir -p /etc/sonic/old_config