Skip to content

Allow libexec for hotplug (SC-532)#1088

Merged
TheRealFalcon merged 2 commits into
canonical:mainfrom
TheRealFalcon:hotplug-copr
Oct 29, 2021
Merged

Allow libexec for hotplug (SC-532)#1088
TheRealFalcon merged 2 commits into
canonical:mainfrom
TheRealFalcon:hotplug-copr

Conversation

@TheRealFalcon
Copy link
Copy Markdown
Contributor

@TheRealFalcon TheRealFalcon commented Oct 29, 2021

Proposed Commit Message

Allow libexec for hotplug

When we added the install hotplug module, we forgot to update the
redhet/cloud-init.spec.in file and allow for execution on /usr/libexec.
This PR adds that functionality

Additional Context

Test Steps

Verified rpm package builds, /etc/udev/rules.d/10-cloud-init-hook-hotplug.rules gets written and references /usr/libexec/cloud-init/hoook-hotplug and /usr/libexec/cloud-init/hook-hotplug exists. Also tested that integration test still passes on ubuntu.

Checklist:

  • My code follows the process laid out in the documentation
  • I have updated or added any unit tests accordingly
  • I have updated or added any documentation accordingly

@TheRealFalcon TheRealFalcon changed the title WIP: Allow libexec for hotplug WIP: Allow libexec for hotplug (SC-532) Oct 29, 2021
Copy link
Copy Markdown
Collaborator

@blackboxsw blackboxsw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 this is a reasonable runtime approach to installing to the right path

log.debug("Skipping hotplug install, udevadm not found")
return

# This may need to turn into a distro property at some point
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 I'm good with this approach. Checking /usr/libexec dir first would allow us to prefer that on distros that have installed cloud-init to that path.

When we added the install hotplug module, we forgot to update the
redhet/cloud-init.spec.in file and allow for execution on /usr/libexec.
This PR adds that functionality
@TheRealFalcon TheRealFalcon changed the title WIP: Allow libexec for hotplug (SC-532) Allow libexec for hotplug (SC-532) Oct 29, 2021
@TheRealFalcon TheRealFalcon merged commit a90d833 into canonical:main Oct 29, 2021
@TheRealFalcon TheRealFalcon deleted the hotplug-copr branch October 29, 2021 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants