Commit 37bdf6d
committed
VMAccess: Add Azure Linux / Mariner support to _get_default_ssh_config_filename
As preparation for the release of Azure Linux 4.0, this patch adds
support for Azure Linux and CBL-Mariner to the VMAccess extension's
sshd_config reset functionality.
When 'az vm user reset-ssh' is triggered on Azure Linux (or
CBL-Mariner), _get_default_ssh_config_filename() falls through to the
generic 'default' resource file because NAME="Azure Linux" does not
match any of the existing distro regexes (centos, debian, fedora,
red hat, suse, ubuntu).
The 'default' resource file is a Debian/Ubuntu-era sshd_config that
causes the following problems on Azure Linux:
- SFTP broken: wrong Subsystem path (/usr/lib/openssh/sftp-server
instead of /usr/libexec/openssh/sftp-server)
- Multiple deprecated directive warnings from sshd -t
- Unable to load host key: /etc/ssh/ssh_host_dsa_key (DSA removed)
- Include /etc/ssh/sshd_config.d/*.conf directive dropped, causing
all sshd_config.d snippets (cloud-init, Azure) to be silently lost
- PasswordAuthentication explicitly set to yes
- PermitRootLogin uses old 'without-password' syntax
Changes:
1. Add 'azure\s?linux|mariner' regex to _get_default_ssh_config_filename()
returning 'azurelinux_default'. This matches:
- Azure Linux: NAME="Azure Linux"
- CBL-Mariner: NAME="Common Base Linux Mariner"
2. Add resources/azurelinux_default: stock Azure Linux sshd_config.
Clean config with no deprecated directives, correct SFTP path,
and Include directive preserved.
Tested on an Azure Linux VM:
- sshd -t: 0 errors (vs 6 with 'default')
- SFTP Subsystem: /usr/libexec/openssh/sftp-server (correct)
- Include /etc/ssh/sshd_config.d/*.conf: preserved
- sshd restart: clean1 parent 4ccb560 commit 37bdf6d
2 files changed
Lines changed: 134 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
392 | 392 | | |
393 | 393 | | |
394 | 394 | | |
| 395 | + | |
| 396 | + | |
395 | 397 | | |
396 | 398 | | |
397 | 399 | | |
| |||
0 commit comments