diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-10-18 09:11:50 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2026-10-24 09:04:43 +0200 |
| commit | ed8f5cf44b2e6002c849fcdabe7373d8d17dfdf4 (patch) | |
| tree | bc0be71628a3c3288381d3ff4d15506e5f13738c | |
| parent | 08e279b0894701570efc1ccdab38a917373ed8f4 (diff) | |
| download | vyos-1x-ed8f5cf44b2e6002c849fcdabe7373d8d17dfdf4.tar.gz vyos-1x-ed8f5cf44b2e6002c849fcdabe7373d8d17dfdf4.zip | |
T9477: remove no longer needed executable bit from migration scripts
Migration scripts are loaded as modules by the migration runner and are no
longer executed individually. Drop the executable bit and make the build
abort if any migration script is executable.
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/migration-scripts/firewall/17-to-18 | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/migration-scripts/reverse-proxy/1-to-2 | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/migration-scripts/reverse-proxy/2-to-3 | 0 |
4 files changed, 2 insertions, 8 deletions
@@ -109,16 +109,10 @@ test: generate-configd-include-json set -e; python3 -m compileall -q -x '/vmware-tools/scripts/' . PYTHONPATH=python/ python3 -m nose2 -v -.PHONY: check_migration_scripts_executable -.ONESHELL: -check_migration_scripts_executable: - @echo "Checking if migration scripts have executable bit set..." - find src/migration-scripts -type f -not -executable -print -exec false {} + || sh -c 'echo "Found files that are not executable! Add permissions." && exit 1' - .PHONY: check_scripts_not_executable check_scripts_not_executable: - @echo "Checking that conf_mode scripts have no executable bit set..." - @find src/conf_mode -type f -perm /111 -print -exec false {} + || sh -c 'echo "Found executable files! Remove executable bit." && exit 1' + @echo "Checking that conf_mode and migration scripts have no executable bit set..." + @find src/conf_mode src/migration-scripts -type f -perm /111 -print -exec false {} + || sh -c 'echo "Found executable files! Remove executable bit." && exit 1' .PHONY: pylint pylint: interface_definitions diff --git a/src/migration-scripts/firewall/17-to-18 b/src/migration-scripts/firewall/17-to-18 index 6cde20870..6cde20870 100755..100644 --- a/src/migration-scripts/firewall/17-to-18 +++ b/src/migration-scripts/firewall/17-to-18 diff --git a/src/migration-scripts/reverse-proxy/1-to-2 b/src/migration-scripts/reverse-proxy/1-to-2 index 4b72107b1..4b72107b1 100755..100644 --- a/src/migration-scripts/reverse-proxy/1-to-2 +++ b/src/migration-scripts/reverse-proxy/1-to-2 diff --git a/src/migration-scripts/reverse-proxy/2-to-3 b/src/migration-scripts/reverse-proxy/2-to-3 index bf3403d11..bf3403d11 100755..100644 --- a/src/migration-scripts/reverse-proxy/2-to-3 +++ b/src/migration-scripts/reverse-proxy/2-to-3 |