summaryrefslogtreecommitdiff
path: root/cloudinit/distros/arch.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2015-01-22 12:09:52 -0500
committerScott Moser <smoser@ubuntu.com>2015-01-22 12:09:52 -0500
commitde32623e6b34e3648958f1a08ef721ed9a03f2f8 (patch)
treed10ae9a3770fad0bdeb83a597523b8d30e259c9e /cloudinit/distros/arch.py
parentc80892c9c326716724c3ff06d9a82516a4152c74 (diff)
parent8d453d2a4da4492857a4487b14fe7b11a014115b (diff)
downloadvyos-cloud-init-de32623e6b34e3648958f1a08ef721ed9a03f2f8.tar.gz
vyos-cloud-init-de32623e6b34e3648958f1a08ef721ed9a03f2f8.zip
merge from trunk
Diffstat (limited to 'cloudinit/distros/arch.py')
-rw-r--r--cloudinit/distros/arch.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/cloudinit/distros/arch.py b/cloudinit/distros/arch.py
index 005a0dd4..68bf1aab 100644
--- a/cloudinit/distros/arch.py
+++ b/cloudinit/distros/arch.py
@@ -118,13 +118,6 @@ class Distro(distros.Distro):
return False
return True
- def _select_hostname(self, hostname, fqdn):
- # Prefer the short hostname over the long
- # fully qualified domain name
- if not hostname:
- return fqdn
- return hostname
-
def _write_hostname(self, your_hostname, out_fn):
conf = None
try: