diff options
author | Ryan Harper <ryan.harper@canonical.com> | 2019-03-08 22:37:05 +0000 |
---|---|---|
committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2019-03-08 22:37:05 +0000 |
commit | 3554ffe8657738795ae5e1b89f22b39358d78821 (patch) | |
tree | 5771d994706f1a681adc972801275b329c4d9500 /tools/cloud-init-per | |
parent | 7c07af289b77ce9ae2e20c6f2638a54e63f016ef (diff) | |
download | vyos-cloud-init-3554ffe8657738795ae5e1b89f22b39358d78821.tar.gz vyos-cloud-init-3554ffe8657738795ae5e1b89f22b39358d78821.zip |
cloud-init-per: POSIX sh does not support string subst, use sed
cloud-init-per is run via /bin/sh which requires POSIX shell
compliance and does not implement string substitution like
bash. Replace these calls with use of sed.
LP: #1819222
Diffstat (limited to 'tools/cloud-init-per')
-rwxr-xr-x | tools/cloud-init-per | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/cloud-init-per b/tools/cloud-init-per index eae3e93f..fcd1ea79 100755 --- a/tools/cloud-init-per +++ b/tools/cloud-init-per @@ -38,7 +38,7 @@ fi [ "$1" = "-h" -o "$1" = "--help" ] && { Usage ; exit 0; } [ $# -ge 3 ] || { Usage 1>&2; exit 1; } freq=$1 -name=${2/-/_} +name=$(echo $2 | sed 's/-/_/g') shift 2; [ "${name#*/}" = "${name}" ] || fail "name cannot contain a /" @@ -56,7 +56,7 @@ esac # Rename legacy sem files with dashes in their names. Do not overwrite existing # sem files to prevent clobbering those which may have been created from calls # outside of cloud-init. -sem_legacy="${sem/_/-}" +sem_legacy=$(echo $sem | sed 's/_/-/g') [ "$sem" != "$sem_legacy" -a -e "$sem_legacy" ] && mv -n "$sem_legacy" "$sem" [ "$freq" != "always" -a -e "$sem" ] && exit 0 |