I've rebased the changes and the merge conflicts are not fixed.
I've run a test and everything worked fine, but I believe the code wasn't
really exercised because rsyslog implementation does a good work in monitoring
the reboot after the installation so the first ping command doesn't fail in VMs
as it used to do in the past.
Anyway, since I tested already before the rebasing, I don't expect any
problem.
I've rebased the changes and the merge conflicts are not fixed.
I've run a test and everything worked fine, but I believe the code wasn't
really exercised because rsyslog implementation does a good work in monitoring
the reboot after the installation so the first ping command doesn't fail in VMs
as it used to do in the past.
Anyway, since I tested already before the rebasing, I don't expect any
problem.