summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-04-20 15:11:18 +0200
committerChristian Poessinger <christian@poessinger.com>2019-04-20 15:11:18 +0200
commit05c539ea5595790b297904569cbe13089ce79e18 (patch)
treeccf406c7ab59ff1f3ededcd3d08c6be84fa73ec3 /src
parent890d8b84e372095f988102cbe5921cccb9feb910 (diff)
downloadvyos-1x-05c539ea5595790b297904569cbe13089ce79e18.tar.gz
vyos-1x-05c539ea5595790b297904569cbe13089ce79e18.zip
[hostname] T1336: trailing dots in system domain-name are invalid
Debian/Systemd provides hostnamectl which disabllows setting a FQDN when there is a trailing (.) in the provided hostname. Extend regex when setting "system domain-name" that there can't be a trailing (.). Provide migration script for current installations to remove the dot.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/migration-scripts/system/11-to-1232
1 files changed, 32 insertions, 0 deletions
diff --git a/src/migration-scripts/system/11-to-12 b/src/migration-scripts/system/11-to-12
new file mode 100755
index 000000000..159fd771b
--- /dev/null
+++ b/src/migration-scripts/system/11-to-12
@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+
+# Latest version of Debian/Systemd hostnamectl does not support a trialing dot
+# in the systems hostname. Ensure that there is no trailing dot in the configured
+# systems domain-name.
+
+import sys
+from vyos.configtree import ConfigTree
+
+if (len(sys.argv) < 1):
+ print("Must specify file name!")
+ sys.exit(1)
+
+file_name = sys.argv[1]
+
+with open(file_name, 'r') as f:
+ config_file = f.read()
+
+config = ConfigTree(config_file)
+if not config.exists(['system', 'domain-name']):
+ # Nothing to do
+ sys.exit(0)
+else:
+ domainname = config.return_value(['system', 'domain-name'])
+ config.set(['system', 'domain-name'], value=domainname.rstrip('.'))
+
+ try:
+ with open(file_name, 'w') as f:
+ f.write(config.to_string())
+ except OSError as e:
+ print("Failed to save the modified config: {}".format(e))
+ sys.exit(1)