diff options
| author | zsdc <taras@vyos.io> | 2021-03-23 22:04:47 +0200 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2021-03-23 22:30:44 +0200 |
| commit | 892606252f8e817c1246111b045fd9072846d6c0 (patch) | |
| tree | 16c576dc2d9f53666f2b45292ed2eccae09ae232 | |
| parent | a6dcf92d9517d2e410f8b4e14145d44e6bb8b3f6 (diff) | |
| download | vyatta-cfg-892606252f8e817c1246111b045fd9072846d6c0.tar.gz vyatta-cfg-892606252f8e817c1246111b045fd9072846d6c0.zip | |
scripts: T3425: Make paths to custom scripts relative
In some cases, like ISO or PXE boot, the `/opt/vyatta/etc/config/` folder does not bind to `/config/`. To run scripts from the `/scripts/` subfolder paths must be relative, just like for the `config.boot` file.
This commit replaces hardcoded paths to relative that use the `$vyatta_sysconfdir` as the prefix.
| -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 4437285..8678c92 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 } |