Merge ~vkuznets/cloud-init:cloud-init-per-dashes into cloud-init:master

[Vitaly Kuznetsov]

This is to fix https://bugs.launchpad.net/cloud-init/+bug/1812676

[Ryan Harper (raharper)]

review: Needs Information

[Vitaly Kuznetsov (vkuznets)]

That's exactly the reason - to not overwrite existing sem which may belong to a different bootper command.

Let's say I have "my-echo" and "my_echo" services. I currently have

/var/lib/cloud/instance/sem/bootper.my-echo.instance
/var/lib/cloud/instance/sem/bootper.my_echo.instance

files. Post-patch when "my_echo" service is being processed we will see
sem=/var/lib/cloud/instance/sem/bootper.my_echo.instance
sem_legacy=/var/lib/cloud/instance/sem/bootper.my-echo.instance

without '-n' /var/lib/cloud/instance/sem/bootper.my_echo.instance will be ruined.

I, of course, cannot be in this situation if I'm running cloud-init-per from cloud-init (because of the issue I'm trying to address with the patch). However, it's not forbidden to run cloud-init-per from somewhere else, just line a shell command and in this scanarion both 'my-echo' and 'my_echo' will actually work correctly.

[Vitaly Kuznetsov (vkuznets)]

Sorry, I probably screwed up and replied in a separate comment.

[Ryan Harper (raharper)]

Thanks; that's a good point about stand-alone execution.

review: Needs Fixing

[Vitaly Kuznetsov (vkuznets)]

Ryan Harper <email address hidden> writes:

> s/whith/with
>
> And let's leave a comment in here about the mv -n, to ensure
> we don't clobber sems that may have been created from calls
> outside of cloud-init.
>

Added, thanks!

--
Vitaly

[Vitaly Kuznetsov (vkuznets)]

Ping, please let me know if something in 'v2' still needs fixing. Thanks!

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:1482b56249dc14aa4b62d19c0f4d1261352c8d3b
https://jenkins.ubuntu.com/server/job/cloud-init-ci/563/
Executed test runs:
    FAILED: Checkout

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/563/rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:1482b56249dc14aa4b62d19c0f4d1261352c8d3b
https://jenkins.ubuntu.com/server/job/cloud-init-ci/564/
Executed test runs:
    FAILED: Checkout

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/564/rebuild

review: Needs Fixing (continuous-integration)

[Ryan Harper (raharper)]

Kicking off a CI run on this.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:1482b56249dc14aa4b62d19c0f4d1261352c8d3b
https://jenkins.ubuntu.com/server/job/cloud-init-ci/565/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/565/rebuild

review: Approve (continuous-integration)

diff --git a/tools/cloud-init-per b/tools/cloud-init-per
index 7d6754b..eae3e93 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=${2/-/_}
 shift 2;
 
 [ "${name#*/}" = "${name}" ] || fail "name cannot contain a /"
@@ -53,6 +53,12 @@ esac
 [ -d "${sem%/*}" ] || mkdir -p "${sem%/*}" ||
    fail "failed to make directory for ${sem}"
 
+# 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" != "$sem_legacy" -a -e "$sem_legacy" ] && mv -n "$sem_legacy" "$sem"
+
 [ "$freq" != "always" -a -e "$sem" ] && exit 0
 "$@"
 ret=$?