Duplicate ReturnToService line in /etc/slurm/slurm.conf?

[mikerenfro]

Currently have slurm-example-configs-ohpc-23.11.6-310.ohpc.5.1.x86_64 installed on Rocky 9.

ohpc/components/rms/slurm/SOURCES/slurm.conf.example.patch

Line 45 in 792e7cd

+ReturnToService=1

There are notes on the previous line indicating there was a ReturnToService variable removed earlier, but that doesn't appear to be the case.

[rocky@sms ~]$ grep ReturnToService /etc/slurm/slurm.conf.example
ReturnToService=1
# Adding ReturnToService Directive to starting config file (note removal of variable during above creation)
ReturnToService=1

Did I miss something, or should this line be removed from the patch, or the earlier ReturnToService line be removed via whatever method was proposed?

[adrianreber]

If the upstream file already contains the line then we do not have to include it second time. Removing it from the patch sounds correct. The git history is not entirely clear why it is removed and then added back. There is some discussion in #234.

Anyway, I think the patch can be adapted to not add the line. The comment also doesn't make any sense any more.

[github-actions]

A friendly reminder that this issue had no activity for 30 days.