Cleanup and fix for hostname fallback

[oldarmyc]

When hostnamectl fails hostname is invoked and should also update the /etc/hostname file in addition to running the command.