diff options
author | Christian Poessinger <christian@poessinger.com> | 2019-04-20 15:29:11 +0200 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2019-04-20 15:29:11 +0200 |
commit | 7681f586860bb4ad22f5b83fb6144a13556954c4 (patch) | |
tree | 1d9520fc735aad9721ccb0aa8d30dfb1cae45157 /src/migration-scripts | |
parent | 05c539ea5595790b297904569cbe13089ce79e18 (diff) | |
download | vyos-1x-7681f586860bb4ad22f5b83fb6144a13556954c4.tar.gz vyos-1x-7681f586860bb4ad22f5b83fb6144a13556954c4.zip |
Revert "[hostname] T1336: trailing dots in system domain-name are invalid"
This reverts commit 05c539ea5595790b297904569cbe13089ce79e18.
Diffstat (limited to 'src/migration-scripts')
-rwxr-xr-x | src/migration-scripts/system/11-to-12 | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/src/migration-scripts/system/11-to-12 b/src/migration-scripts/system/11-to-12 deleted file mode 100755 index 159fd771b..000000000 --- a/src/migration-scripts/system/11-to-12 +++ /dev/null @@ -1,32 +0,0 @@ -#!/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) |