diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-04-17 13:01:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-17 13:01:18 +0200 |
| commit | e7bc6d49ff7be1654769f8f70c6027d067fd8233 (patch) | |
| tree | 48706294dbaacb5e8a1ba2b29e2b2009e2fa965c | |
| parent | 8f710a8fa3c50ff0020c771f05c0d4bb56f4787e (diff) | |
| parent | 892606252f8e817c1246111b045fd9072846d6c0 (diff) | |
| download | vyatta-cfg-e7bc6d49ff7be1654769f8f70c6027d067fd8233.tar.gz vyatta-cfg-e7bc6d49ff7be1654769f8f70c6027d067fd8233.zip | |
Merge pull request #32 from zdc/T3425-sagitta
scripts: T3425: Make paths to custom scripts relative
| -rwxr-xr-x | scripts/init/vyos-router | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/init/vyos-router b/scripts/init/vyos-router index 6c0ea18..c73fe17 100755 --- a/scripts/init/vyos-router +++ b/scripts/init/vyos-router @@ -110,33 +110,33 @@ load_bootfile () # execute the pre-config script run_preconfig_script () { - if [ -x /config/scripts/vyos-preconfig-bootup.script ]; then - /config/scripts/vyos-preconfig-bootup.script + if [ -x $vyatta_sysconfdir/config/scripts/vyos-preconfig-bootup.script ]; then + $vyatta_sysconfdir/config/scripts/vyos-preconfig-bootup.script fi } # execute the post-config scripts run_postconfig_scripts () { - if [ -x /config/scripts/vyatta-postconfig-bootup.script ]; then - /config/scripts/vyatta-postconfig-bootup.script + if [ -x $vyatta_sysconfdir/config/scripts/vyatta-postconfig-bootup.script ]; then + $vyatta_sysconfdir/config/scripts/vyatta-postconfig-bootup.script fi - if [ -x /config/scripts/vyos-postconfig-bootup.script ]; then - /config/scripts/vyos-postconfig-bootup.script + if [ -x $vyatta_sysconfdir/config/scripts/vyos-postconfig-bootup.script ]; then + $vyatta_sysconfdir/config/scripts/vyos-postconfig-bootup.script fi } run_postupgrade_script () { - if [ -f /config/.upgraded ]; then + if [ -f $vyatta_sysconfdir/config/.upgraded ]; then # Run the system script /usr/libexec/vyos/system/post-upgrade # Run user scripts - if [ -d /config/scripts/post-upgrade.d ]; then - run-parts /config/scripts/post-upgrade.d + if [ -d $vyatta_sysconfdir/config/scripts/post-upgrade.d ]; then + run-parts $vyatta_sysconfdir/config/scripts/post-upgrade.d fi - rm -f /config/.upgraded + rm -f $vyatta_sysconfdir/config/.upgraded fi } |