Skip to content

M
mkimage-profiles
Commit 2d53a9af authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

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

Network interface managed by NetworkManager is not activated when alterator-setup is launched.
parent cd88c10e
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
features.in/net-eth/rootfs/image-scripts.d/50-net-eth
View file @ 2d53a9af
...@@ -6,11 +6,15 @@ ...@@ -6,11 +6,15 @@
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 type -t NetworkManager >&/dev/null || if [ -n "$GLOBAL_NMCTL" ]; then
NMCTL="$GLOBAL_NMCTL"
else
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"
......
features.in/oem/config.mk
View file @ 2d53a9af
...@@ -7,6 +7,8 @@ use/oem: use/services use/branding ...@@ -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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment