diff --git a/features.in/net/README b/features.in/net/README index 38637e413..75e3c3994 100644 --- a/features.in/net/README +++ b/features.in/net/README @@ -1,2 +1,5 @@ Эта фича конфигурирует базовую поддержку сети, включая нужную подсистему (etcnet, NetworkManager поверх etcnet или connman). + +Используйте TARGET_HOSTNAME для определения имени узла (файлы +/etc/sysconfig/network и /etc/hostname). diff --git a/features.in/net/config.mk b/features.in/net/config.mk index 799fadf55..bb28e6df8 100644 --- a/features.in/net/config.mk +++ b/features.in/net/config.mk @@ -7,6 +7,7 @@ use/net: use/services use/pkgpriorities @$(call add,THE_PACKAGES,iputils) @$(call add,PINNED_PACKAGES,$$(THE_NET_SUBSYS)) @$(call set,THE_NET_SUBSYS,network-config-subsystem) + @$(call xport,TARGET_HOSTNAME) use/net/etcnet: use/net @$(call set,THE_NET_SUBSYS,etcnet) diff --git a/features.in/net/rootfs/image-scripts.d/50-net-hostname b/features.in/net/rootfs/image-scripts.d/50-net-hostname new file mode 100755 index 000000000..fd164dde6 --- /dev/null +++ b/features.in/net/rootfs/image-scripts.d/50-net-hostname @@ -0,0 +1,10 @@ +#!/bin/sh -efu +# +# Sets up the node's hostname. + +. shell-config + +if [ -n "${GLOBAL_TARGET_HOSTNAME:-}" ]; then + shell_config_set /etc/sysconfig/network 'TARGET_HOSTNAME' "$GLOBAL_TARGET_HOSTNAME" + echo "$GLOBAL_TARGET_HOSTNAME" >/etc/hostname +fi