Same comment here as in previous pull request:
Would you mind, while at it, to change 'hostname -f' by 'hostname --fqdn', which is the real command?  I know that they're are just short and long versions of the same command, but...