keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net-eth, oem: use/oem/vnc for disable NetworkManager control eth0

Browse Source 
Network interface managed by NetworkManager is not activated when
alterator-setup is launched.
This commit is contained in:
Anton Midyukov 2020-07-03 04:56:33 +07:00
parent cd88c10e95
commit 2d53a9af94
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features.in/net-eth/rootfs/image-scripts.d/50-net-eth
View File

@ -6,12 +6,16 @@
fatal() { echo "error: $*" >&2; exit 1; } fatal() { echo "error: $*" >&2; exit 1; }
# simple etcnet configurations are also picked up by NM # simple etcnet configurations are also picked up by NM
if [ -n "$GLOBAL_NMCTL" ]; then
NMCTL="$GLOBAL_NMCTL"
else
if type -t NetworkManager >&/dev/null || if type -t NetworkManager >&/dev/null ||
type -t connmand >&/dev/null; then type -t connmand >&/dev/null; then
NMCTL=yes NMCTL=yes
else else
NMCTL=no NMCTL=no
fi fi
fi
ETCNET_IFDIR="/etc/net/ifaces" ETCNET_IFDIR="/etc/net/ifaces"
SYSTEMD_IFDIR="/etc/systemd/network" SYSTEMD_IFDIR="/etc/systemd/network"

4
features.in/oem/config.mk
View File

@ -7,6 +7,8 @@ use/oem: use/services use/branding
@$(call add,DEFAULT_SERVICES_ENABLE,$$(OEM_TARGET)) @$(call add,DEFAULT_SERVICES_ENABLE,$$(OEM_TARGET))
@$(call xport,OEM_TARGET) @$(call xport,OEM_TARGET)
use/oem/vnc: use/oem use/x11-vnc use/oem/vnc: use/oem use/x11-vnc use/net-eth/dhcp
@$(call add,THE_PACKAGES,alterator-setup-x11vnc) @$(call add,THE_PACKAGES,alterator-setup-x11vnc)
@$(call set,OEM_TARGET,setup-vnc) @$(call set,OEM_TARGET,setup-vnc)
@$(call set,NMCTL,no)
@$(call xport,NMCTL)