No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/migration-scripts/system/8-to-9 b/src/migration-scripts/system/8-to-9
	index db3fefdea..cd92f3023 100755
	--- a/src/migration-scripts/system/8-to-9
	+++ b/src/migration-scripts/system/8-to-9
	@@ -1,32 +1,36 @@
	#!/usr/bin/env python3

	-# Deletes "system package" option as it is deprecated
	+# Deletes the deprecated "system package" and "service telnet" options

	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', 'package']):
	+if (not config.exists(['system', 'package'])) and (not config.exists(['service', 'telnet'])):
	# Nothing to do
	sys.exit(0)
	else:
	- # Delete the node with the old syntax
	- config.delete(['system', 'package'])
	+ # Delete the "system package" subtree
	+ if config.exists(['system', 'package']):
	+ config.delete(['system', 'package'])
	+
	+ if config.exists(['service', 'telnet']):
	+ config.delete(['service', 'telnet'])

	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)