Thanks @jaevans! Could you rebase your PR on main and retarget your PR? We've changed how backports are handled since you originally filed this bug.

Can one of the admins verify this patch?

I rebased on main, that brought in a bunch of 8.x stuff, was that the correct thing to do? What else needs to be done for this PR?

Hi @jaevans could you do the following:

git checkout main
git pull
git checkout systemd-for-raspbian-7.x
git reset --hard upstream/main
git cherry-pick a911d1cd2eaf129a738cc6466eea5defa6968aa4
git push --force <remote> HEAD

Then change the base branch for this PR to main. Once the changes are merged to main, we will handle backporting to 7.x provided it is low-risk and doesn't break existing provider suitability checks.

Hi @jaevans it seems your pull request contains a merge commit d4c9652. We prefer that PRs don't contain merge commits, otherwise, it complicates the git history. Could you execute the following:

git checkout systemd-for-raspbian-7.x
git fetch upstream
git reset --hard upstream/main
git cherry-pick 2dc127f
git push -f origin HEAD

The above commands assume upstream is the puppetlabs remote and origin is your fork. You can see which is which by executing git remote -v