diff options
| author | John Estabrook <jestabro@vyos.io> | 2020-03-12 14:18:56 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2020-03-12 14:18:56 -0500 |
| commit | 4aa1f9eda7ce761a7e38bfd7b8a4ef3610d53feb (patch) | |
| tree | e4e405b36f971a6502d1ad5355ef6d1726deef6e /scripts/init | |
| parent | 103e08d8a7595c791664724833db70a232c5ddd7 (diff) | |
| download | vyatta-cfg-4aa1f9eda7ce761a7e38bfd7b8a4ef3610d53feb.tar.gz vyatta-cfg-4aa1f9eda7ce761a7e38bfd7b8a4ef3610d53feb.zip | |
[boot-config-loader] T1622: use vyos-boot-config-loader, if available
Diffstat (limited to 'scripts/init')
| -rwxr-xr-x | scripts/init/vyos-router | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router index 9fc8a51..2668390 100755 --- a/scripts/init/vyos-router +++ b/scripts/init/vyos-router @@ -98,7 +98,12 @@ load_bootfile () # build-specific environment for boot-time config loading source /etc/default/vyatta-load-boot fi - sg ${GROUP} -c "$vyatta_sbindir/vyatta-boot-config-loader $BOOTFILE" + if [ -x $vyos_libexec_dir/vyos-boot-config-loader.py ]; then + sg ${GROUP} -c "$vyos_libexec_dir/vyos-boot-config-loader.py $BOOTFILE" + else + # if not available, fallback to earlier version + sg ${GROUP} -c "$vyatta_sbindir/vyatta-boot-config-loader $BOOTFILE" + fi ) } |