F #227, #86: Netcfg default for Amazon Linux 2, typos

pull/252/head
Vlastimil Holer 3 years ago
parent d5e3d3ac93
commit df90cb5eb0
No known key found for this signature in database
GPG Key ID: EB549BADEFD07C53

@ -79,6 +79,7 @@ Selectable configuration types and IP configuration methods are **supported only
|---------------------------------------------------------------|-------------------------------------------| |---------------------------------------------------------------|-------------------------------------------|
| Alpine Linux 3.14 | `interfaces` | | Alpine Linux 3.14 | `interfaces` |
| ALT Linux p9, p10, Sisyphus | `networkd`, `nm` | | ALT Linux p9, p10, Sisyphus | `networkd`, `nm` |
| Amazon Linux 2 | `scripts` |
| Debian 9 | `interfaces` | | Debian 9 | `interfaces` |
| Debian 10, 11 | `interfaces`, `netplan`, `nm`, `networkd` | | Debian 10, 11 | `interfaces`, `netplan`, `nm`, `networkd` |
| Devuan 2 | `interfaces` | | Devuan 2 | `interfaces` |

@ -45,6 +45,9 @@ if [ -z "${NETCFG_TYPE}" ] ; then
opensuse*|sles|sled) opensuse*|sles|sled)
NETCFG_TYPE='scripts' NETCFG_TYPE='scripts'
;; ;;
amzn)
NETCFG_TYPE='scripts'
;;
freebsd) freebsd)
NETCFG_TYPE='bsd' NETCFG_TYPE='bsd'
;; ;;
@ -81,7 +84,7 @@ fi
if [ "${NETCFG_TYPE}" != 'none' ] ; then if [ "${NETCFG_TYPE}" != 'none' ] ; then
_found_valid_netcfg='no' _found_valid_netcfg='no'
# from a space separated list of $NECFG_TYPE candidates check one # from a space separated list of $NETCFG_TYPE candidates check one
# by one and select the first suitable one for current environment # by one and select the first suitable one for current environment
for _cfgtype in ${NETCFG_TYPE} ; do for _cfgtype in ${NETCFG_TYPE} ; do
_cfgtype_file="/etc/one-context.d/loc-10-network.d/netcfg-$(basename "${_cfgtype}")" _cfgtype_file="/etc/one-context.d/loc-10-network.d/netcfg-$(basename "${_cfgtype}")"

@ -31,7 +31,7 @@ is_network_supported()
if command -v systemctl &>/dev/null; then if command -v systemctl &>/dev/null; then
systemctl is-enabled network &>/dev/null && return 0 systemctl is-enabled network &>/dev/null && return 0
# NOTE: Probably not necesary test on old systems # NOTE: Probably not necessary test on old systems
elif chkconfig network --level 3 &>/dev/null || \ elif chkconfig network --level 3 &>/dev/null || \
chkconfig network --level 5 &>/dev/null; chkconfig network --level 5 &>/dev/null;
then then

Loading…
Cancel
Save