diff options
Diffstat (limited to 'azurelinuxagent/distro/default/deprovision.py')
| -rw-r--r-- | azurelinuxagent/distro/default/deprovision.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/azurelinuxagent/distro/default/deprovision.py b/azurelinuxagent/distro/default/deprovision.py index 231f4eb..b62c5f6 100644 --- a/azurelinuxagent/distro/default/deprovision.py +++ b/azurelinuxagent/distro/default/deprovision.py @@ -1,4 +1,4 @@ -# Windows Azure Linux Agent +# Microsoft Azure Linux Agent # # Copyright 2014 Microsoft Corporation # @@ -19,6 +19,7 @@ import azurelinuxagent.conf as conf from azurelinuxagent.utils.osutil import OSUTIL +from azurelinuxagent.future import read_input import azurelinuxagent.protocol as prot import azurelinuxagent.protocol.ovfenv as ovf import azurelinuxagent.utils.fileutil as fileutil @@ -58,8 +59,6 @@ class DeprovisionHandler(object): def regen_ssh_host_key(self, warnings, actions): warnings.append("WARNING! All SSH host key pairs will be deleted.") - actions.append(DeprovisionAction(OSUTIL.set_hostname, - ['localhost.localdomain'])) actions.append(DeprovisionAction(shellutil.run, ['rm -f /etc/ssh/ssh_host_*key*'])) @@ -80,6 +79,11 @@ class DeprovisionHandler(object): dirs_to_del = [OSUTIL.get_lib_dir()] actions.append(DeprovisionAction(fileutil.rm_dirs, dirs_to_del)) + def reset_hostname(self, warnings, actions): + localhost = ["localhost.localdomain"] + actions.append(DeprovisionAction(OSUTIL.set_hostname, localhost)) + actions.append(DeprovisionAction(OSUTIL.set_dhcp_hostname, localhost)) + def setup(self, deluser): warnings = [] actions = [] @@ -89,6 +93,7 @@ class DeprovisionHandler(object): self.regen_ssh_host_key(warnings, actions) self.del_dhcp_lease(warnings, actions) + self.reset_hostname(warnings, actions) if conf.get_switch("Provisioning.DeleteRootPassword", False): self.del_root_password(warnings, actions) @@ -107,7 +112,7 @@ class DeprovisionHandler(object): print(warning) if not force: - confirm = input("Do you want to proceed (y/n)") + confirm = read_input("Do you want to proceed (y/n)") if not confirm.lower().startswith('y'): return |